Commit Graph

  • e53661861d last bugfixes main Mikhail Aristov 2024-01-28 15:50:58 +0100
  • 9831759095
    Merge branch 'main' into audio Marvin Dalheimer 2024-01-28 15:33:01 +0100
  • ce13530dfa
    Add sound effects Marvin Dalheimer 2024-01-28 15:16:29 +0100
  • ac4898ffbb fix reference Mikhail Aristov 2024-01-28 15:03:50 +0100
  • 01f0747201 rm bloat Mikhail Aristov 2024-01-28 15:01:21 +0100
  • c9c280491f randomize bottle Mikhail Aristov 2024-01-28 14:57:01 +0100
  • 1ffe5c688c balancing mit W Mikhail Aristov 2024-01-28 14:45:47 +0100
  • 0abd197c18 Audio files. pytunia 2024-01-28 14:38:40 +0100
  • d021fff64b Bottles reduce stamina Waldemar Tomme 2024-01-28 14:07:54 +0100
  • ba841c2eb2 Merge branch 'main' of 192.168.8.1:tough_crowd Mikhail Aristov 2024-01-28 13:51:57 +0100
  • 440f560e9c Merge branch 'main' of git@192.168.8.1:tough_crowd into joke-stamina-scaling Waldemar Tomme 2024-01-28 13:50:59 +0100
  • 6c753bd7ad Remove stamina categories from joke button Waldemar Tomme 2024-01-28 13:50:37 +0100
  • c03040184e Merge remote-tracking branch 'remotes/origin/main' into clean_bloat Mikhail Aristov 2024-01-28 13:50:04 +0100
  • a55d6f04a0 Jokes now have an effectiveness scaling based on stamina Waldemar Tomme 2024-01-28 13:47:34 +0100
  • fae4164619 translations: + tutorial + credits Mikhail Aristov 2024-01-28 13:47:32 +0100
  • 0785d10856 clean bloat Mikhail Aristov 2024-01-28 13:35:03 +0100
  • 89e03cfd66
    Merge branch 'feature/highlight' Marvin Dalheimer 2024-01-28 13:34:28 +0100
  • d44ac6ee02
    Add a spotlight for Tim Marvin Dalheimer 2024-01-28 12:32:09 +0100
  • cb9b905227 People outside target area now also stop losing mood while a joke is told Waldemar Tomme 2024-01-28 12:19:52 +0100
  • afc81354df Merge remote-tracking branch 'origin/main' into art pytunia 2024-01-28 12:10:37 +0100
  • db137d3e97 Walking distance and bubbles fix. pytunia 2024-01-28 12:09:22 +0100
  • d527f9933f Merge branch 'main' of git@192.168.8.1:tough_crowd into joke-bottle Waldemar Tomme 2024-01-28 11:52:17 +0100
  • 64fcffb0f2 Bottles are now jokes Waldemar Tomme 2024-01-28 11:51:33 +0100
  • e7ebfbd74d Merge remote-tracking branch 'origin/main' into art pytunia 2024-01-28 11:29:33 +0100
  • 8e4bc38a61
    improve tutorial Marvin Dalheimer 2024-01-28 11:28:47 +0100
  • 1e4caae6c6 Merge remote-tracking branch 'origin/main' into art pytunia 2024-01-28 11:26:39 +0100
  • c09497686d Empty commit. pytunia 2024-01-28 11:26:31 +0100
  • 46f65587c9 Merge branch 'main' of 192.168.8.1:tough_crowd Mikhail Aristov 2024-01-28 11:25:22 +0100
  • af692e1591 +logo in main menu Mikhail Aristov 2024-01-28 11:24:37 +0100
  • b345937708 Merge branch 'main' of git@192.168.8.1:tough_crowd into balancing Waldemar Tomme 2024-01-28 11:07:55 +0100
  • 146f309c94 +curtain in the score screen Mikhail Aristov 2024-01-28 10:47:21 +0100
  • 361464376a move tables further apart Mikhail Aristov 2024-01-28 10:41:39 +0100
  • 5347ef8dec Merge branch 'main' of git@192.168.8.1:tough_crowd into balancing Waldemar Tomme 2024-01-28 10:35:32 +0100
  • 36823f36c7 fix double joke Mikhail Aristov 2024-01-28 10:34:06 +0100
  • 8014bab5d6 Merge remote-tracking branch 'origin/main' into art pytunia 2024-01-28 10:33:49 +0100
  • 4545b144a9 Empty commit. pytunia 2024-01-28 10:33:35 +0100
  • d92cbf66bf Increase overall mood sensitivity/score Waldemar Tomme 2024-01-28 10:30:18 +0100
  • 77f7b4c010 +custom logo +custom icon +custom splash screen Mikhail Aristov 2024-01-28 10:28:29 +0100
  • 13e4047fad +custom logos Mikhail Aristov 2024-01-28 10:04:40 +0100
  • b5bc64a581 Audience actually hears joke now at the end Waldemar Tomme 2024-01-28 10:02:41 +0100
  • 91630979ec Merge branch 'main' of git@192.168.8.1:tough_crowd into joke-effect-deferral Waldemar Tomme 2024-01-28 09:51:53 +0100
  • af50d4fc88 Merge branch 'main' of 192.168.8.1:tough_crowd Mikhail Aristov 2024-01-28 09:46:20 +0100
  • 5b6a039132 +audience listening +audience ignoring double jokes Mikhail Aristov 2024-01-28 09:45:39 +0100
  • 9d826ce153 Audience hears the joke at the end of talking Waldemar Tomme 2024-01-28 09:45:33 +0100
  • a76cd29124 Disable joke buttons while talking and at game end Waldemar Tomme 2024-01-28 06:59:32 +0100
  • bef92f242d Merge remote-tracking branch 'origin/main' into art pytunia 2024-01-28 09:00:12 +0100
  • f077ff0f97 No change. pytunia 2024-01-28 08:54:10 +0100
  • 05227c75fd Add tutorial scene Waldemar Tomme 2024-01-28 07:28:55 +0100
  • 226313c974 post-merge engine fixes Mikhail Aristov 2024-01-27 21:20:16 +0100
  • 2b07de2666 Merge remote-tracking branch 'remotes/origin/main' into feat_game_over Mikhail Aristov 2024-01-27 21:18:42 +0100
  • 1f125ed467 endgame done Mikhail Aristov 2024-01-27 21:10:50 +0100
  • a6494a9289
    Make buttons visible again Marvin Dalheimer 2024-01-27 20:53:30 +0100
  • fe5436c9ab Merge branch 'main' into feature/tim_animation Marvin Dalheimer 2024-01-27 20:46:22 +0100
  • 762c9a945d Merge remote-tracking branch 'remotes/origin/main' into feat_game_over Mikhail Aristov 2024-01-27 20:35:17 +0100
  • 2c7128aafd Add animations to Tim Marvin Dalheimer 2024-01-27 20:34:39 +0100
  • b91678f5b2 extract score overlay to prefab Mikhail Aristov 2024-01-27 20:31:58 +0100
  • 677a7c518a Add hook stub for empty stamina Waldemar Tomme 2024-01-27 20:25:10 +0100
  • 177e59243b Merge remote-tracking branch 'origin/main' into joke-stamina Waldemar Tomme 2024-01-27 20:17:17 +0100
  • 3dd272eee8 disable overlay for now Mikhail Aristov 2024-01-27 20:17:06 +0100
  • e64963049c +game over Mikhail Aristov 2024-01-27 20:07:56 +0100
  • 6628362c8c Add required joke stamina data Waldemar Tomme 2024-01-27 19:58:18 +0100
  • 86dec7501f Walking and talking. pytunia 2024-01-27 19:34:08 +0100
  • fa47248174 +stamina and mood display Mikhail Aristov 2024-01-27 19:33:33 +0100
  • c1a1f9d1fb Tim talks. pytunia 2024-01-27 19:24:15 +0100
  • ce5c557a4c +stamina and mood Mikhail Aristov 2024-01-27 18:50:35 +0100
  • 6c617708a0 Merge branch 'main' of Y:\git\tough_crowd Mikhail Aristov 2024-01-27 17:59:46 +0100
  • 84d2a3bbb0 +new assets Mikhail Aristov 2024-01-27 17:59:29 +0100
  • a93ae0dcb3
    Add nintendo controller Marvin Dalheimer 2024-01-27 17:52:20 +0100
  • 16b43af80b Adding tables and chairs. pytunia 2024-01-27 17:51:03 +0100
  • 694ecaf2fb remove WASD movement Mikhail Aristov 2024-01-27 17:42:38 +0100
  • 21b96bc687
    Rotate the bottles Marvin Dalheimer 2024-01-27 17:32:41 +0100
  • 7460acf72d +key mappings Mikhail Aristov 2024-01-27 17:23:26 +0100
  • 5147614870 Adapt decay values Waldemar Tomme 2024-01-27 17:15:24 +0100
  • 51546337ce Merge remote-tracking branch 'origin/main' into joke-processing Waldemar Tomme 2024-01-27 17:11:58 +0100
  • 3491b13cb5 Fix input mapping stuff etc. Waldemar Tomme 2024-01-27 17:08:50 +0100
  • d0412d2f01 patch bottles Mikhail Aristov 2024-01-27 17:06:28 +0100
  • 8ade594449 sync indents Mikhail Aristov 2024-01-27 16:56:14 +0100
  • 7021cf6634 Merge branch 'feature/bottle_throwing' Marvin Dalheimer 2024-01-27 16:50:22 +0100
  • af5dcaaa6b Merge remote-tracking branch 'origin/main' into joke-processing Waldemar Tomme 2024-01-27 16:48:23 +0100
  • 473ed41338 Load profile data by color Waldemar Tomme 2024-01-27 16:45:22 +0100
  • 53169cdb33 patch references Mikhail Aristov 2024-01-27 16:35:53 +0100
  • c2192ffdb5 Merge remote-tracking branch 'origin/main' into joke-processing Waldemar Tomme 2024-01-27 16:21:26 +0100
  • 50c859231e fix sprite z index Mikhail Aristov 2024-01-27 16:15:55 +0100
  • ced61c6a45 Cleanup Waldemar Tomme 2024-01-27 16:07:27 +0100
  • 5c45ce6f01 Merge main Waldemar Tomme 2024-01-27 16:05:49 +0100
  • d60617224e Merge remote-tracking branch 'origin/main' into joke-processing Waldemar Tomme 2024-01-27 15:58:24 +0100
  • 7764ec3fd1 Add loadable profile data Waldemar Tomme 2024-01-27 15:56:50 +0100
  • 84ee0d84d2 Merge branch 'feat_bodies' Mikhail Aristov 2024-01-27 15:52:46 +0100
  • 50a636070f fix mood cheat to trigger once per press Mikhail Aristov 2024-01-27 15:51:52 +0100
  • bc8f933e22 throw bottles at Tim and hurt him Marvin Dalheimer 2024-01-27 15:50:20 +0100
  • 2392689db9 Merge remote-tracking branch 'origin/main' into art pytunia 2024-01-27 15:43:22 +0100
  • 4df12455ab +random bodies Mikhail Aristov 2024-01-27 15:40:59 +0100
  • 4095d4df0f Add mood mapping to profile Waldemar Tomme 2024-01-27 15:20:18 +0100
  • 1ce4e6f210 Fixed Jennys hair and weird artefacts in body sprites. pytunia 2024-01-27 15:17:16 +0100
  • 4d2762773e +bodies Mikhail Aristov 2024-01-27 14:08:40 +0100
  • 0c5a0ad84a after merge fixes Mikhail Aristov 2024-01-27 13:58:26 +0100
  • 7f18748659 Merge feat_new_mood into main root 2024-01-27 13:54:28 +0100
  • b466136258 +jenny Mikhail Aristov 2024-01-27 13:36:08 +0100
  • 6220fbdbf9 Set sprites based on jokes Waldemar Tomme 2024-01-27 13:35:14 +0100
  • 9e97fe36cb Merge remote-tracking branch 'remotes/origin/art' into feat_new_mood Mikhail Aristov 2024-01-27 13:31:00 +0100