Nikolay Korolev
2bf88fcef5
Merge branch 'lcs' into lcs-dev
2021-01-09 00:30:13 +03:00
Nikolay Korolev
a9559f03b0
lcs script mode
2021-01-09 00:20:09 +03:00
Sergeanur
af09cb06f5
Merge branch 'miami' into lcs
...
* miami:
Use original names
2021-01-08 21:53:42 +02:00
Sergeanur
faa9e6441b
Use original names
2021-01-08 21:53:11 +02:00
Sergeanur
4debd89d8e
Merge branch 'miami' into lcs
...
# Conflicts:
# src/render/Timecycle.cpp
2021-01-08 20:24:43 +02:00
Sergeanur
e9001207ea
Disable water creatures
2021-01-08 18:26:35 +02:00
Nikolay Korolev
613d08d3e2
Merge branch 'lcs-dev' into lcs
2021-01-08 18:59:14 +03:00
Nikolay Korolev
e92666d988
wtf
2021-01-08 18:57:59 +03:00
aap
8be0567924
little fixes
2021-01-08 13:51:42 +01:00
aap
a99457ee29
fix phones
2021-01-08 13:51:31 +01:00
Sergeanur
0e2af13656
Merge branch 'miami' into lcs
...
* miami:
wtf
fix
small cleanup
Fix gOneShotCol
Fix garage messages position
Fix font on green screen counter
Add MPG123_QUIET to mp3 files
Make opus available alongside other formats
Fix pickup text
Fix char in stats
Add missing GXT line
fail
minor refactoring
Fix 16KHz track
GET_WHEELIE_STATS fix
Cleanup and fixes for new decoders
Fixes for CVbFile
Small fixes for new wav decoder
Remove fastmath from premake's config
Implementing our own WAV decoder to replace SndFile
2021-01-08 14:47:37 +02:00
Nikolay Korolev
824ca7599c
wtf
2021-01-08 13:07:36 +03:00
Nikolay Korolev
f8569a74cb
fix
2021-01-08 12:59:51 +03:00
Nikolay Korolev
236b3b1c2b
more stuff
2021-01-08 12:41:39 +03:00
aap
ebdf08a514
first commit for LCS
2021-01-08 01:41:40 +01:00
Sergeanur
24d73aeb71
Fix garage messages position
2021-01-08 00:04:38 +02:00
Sergeanur
0428b5b694
Fix pickup text
2021-01-07 21:55:41 +02:00
Nikolay Korolev
5e10f1fe6a
sync with upstream
2021-01-07 18:38:40 +03:00
Nikolay Korolev
9d6db921bd
fail
2021-01-07 18:31:54 +03:00
Nikolay Korolev
db1bdfd62d
minor refactoring
2021-01-07 18:30:35 +03:00
Nikolay Korolev
69d30f2204
some lcs stuff
2021-01-07 15:21:35 +03:00
majestic
f61e2d04f1
GET_WHEELIE_STATS fix
2021-01-06 11:56:13 -08:00
Nikolay Korolev
6fa081e004
fix
2021-01-05 00:48:25 +03:00
Sergeanur
1efbd7ead2
Fix unlimited rotation in Phnom Penh '86
2021-01-04 10:58:12 +02:00
Nikolay Korolev
33f467453e
dumb
2021-01-03 23:36:32 +03:00
Nikolay Korolev
bec8f6b86c
reorder
2021-01-03 22:29:16 +03:00
Nikolay Korolev
0392145512
obsolete comment
2021-01-03 19:03:13 +03:00
aap
6579645934
Merge pull request #916 from Sergeanur/VC/VarConsole
...
CVarConsole
2021-01-03 17:01:17 +01:00
Nikolay Korolev
06fd054eb3
fixed intro text line defaults
2021-01-03 18:56:05 +03:00
Nikolay Korolev
5e019ed9f8
fixed array size
2021-01-03 13:57:27 +03:00
Nikolay Korolev
29e0cfa98b
fix
2021-01-03 12:52:26 +03:00
aap
57677b7b55
slightly better variable name
2021-01-02 20:30:16 +01:00
Sergeanur
42e4a068bb
CVarConsole
2021-01-02 13:32:25 +02:00
Nikolay Korolev
c75c4603fc
bad stuff
2021-01-01 23:06:20 +03:00
Nikolay Korolev
29b76fc4f5
small thing
2021-01-01 22:57:17 +03:00
Nikolay Korolev
b4b9f9601b
Merge branch 'miami' into lcs-dev
2021-01-01 14:55:00 +03:00
Nikolay Korolev
9fd93e8e57
merge master to miami
2021-01-01 14:53:20 +03:00
Nikolay Korolev
2f05c64470
actual struct name
2021-01-01 13:35:23 +03:00
Nikolay Korolev
575845772f
Merge branch 'miami' into lcs-dev
2021-01-01 13:21:42 +03:00
Nikolay Korolev
56ea1c7be7
fixed some bugs (saves might be broken though)
2020-12-31 19:29:13 +03:00
Sergeanur
9c2f1b0833
More bike leftovers
2020-12-28 14:00:44 +02:00
Nikolay Korolev
149aef929d
fixed replay
2020-12-26 12:56:20 +03:00
Sergeanur
e00b8a93bf
Fix use of strncmp
2020-12-25 15:18:48 +02:00
Sergeanur
b12eef1d56
Fix use of strncmp
2020-12-25 15:18:13 +02:00
Nikolay Korolev
5f98b4fdca
Merge remote-tracking branch 'upstream/miami' into miami
2020-12-25 12:12:09 +03:00
Nikolay Korolev
86f04884de
fix garage
2020-12-25 12:11:22 +03:00
Sergeanur
6a2edcea46
Small type use fixes
...
# Conflicts:
# src/audio/AudioLogic.cpp
# src/control/Garages.cpp
# src/vehicles/Cranes.cpp
2020-12-25 09:03:13 +02:00
Sergeanur
de31bdc89f
Small type use fixes
2020-12-25 08:59:32 +02:00
Nikolay Korolev
dcb28bfd53
fix
2020-12-20 17:12:34 +03:00
Nikolay Korolev
fc72ff24d0
implemented collectives in script
2020-12-20 17:07:58 +03:00