Commit graph

1435 commits

Author SHA1 Message Date
majestic
2639fba582 just original marker color 2021-01-09 10:26:07 -08:00
Nikolay Korolev
203dff9165 script 2021-01-09 20:33:21 +03:00
Nikolay Korolev
1f79fb608a fix 2021-01-09 17:47:55 +03:00
Nikolay Korolev
a38d0a0fbd Merge branch 'lcs-dev' into lcs 2021-01-09 17:35:57 +03:00
Nikolay Korolev
b32301592f Merge remote-tracking branch 'upstream/lcs' into lcs 2021-01-09 17:35:52 +03:00
Nikolay Korolev
97c95b7639 more script 2021-01-09 17:35:27 +03:00
Sergeanur
da10ce7b05 More linux fix 2021-01-09 13:33:45 +02:00
aap
7f5deb0f97 cam sector fix 2021-01-09 12:10:10 +01:00
aap
225b8953fd streaming fixes 2021-01-09 11:43:58 +01:00
Sergeanur
2ce925caba Sector sizes 2021-01-09 01:22:50 +02:00
Nikolay Korolev
3ac74c86a1 fix 2021-01-09 00:33:16 +03:00
Nikolay Korolev
2bf88fcef5 Merge branch 'lcs' into lcs-dev 2021-01-09 00:30:13 +03:00
Sergeanur
b6875b41f4 Level 4 2021-01-08 23:20:52 +02:00
Nikolay Korolev
a9559f03b0 lcs script mode 2021-01-09 00:20:09 +03:00
Sergeanur
de13141b68 CKeyGen fixes 2021-01-08 22:39:25 +02: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
079b8e0e16 CKeyGen 2021-01-08 20:51:31 +02:00
Sergeanur
4debd89d8e Merge branch 'miami' into lcs
# Conflicts:
#	src/render/Timecycle.cpp
2021-01-08 20:24:43 +02:00
Sergeanur
68e8c1ce04 Add multisampling 2021-01-08 20:22:08 +02:00
Sergeanur
bf3135eb41 Enable trains 2021-01-08 18:31:50 +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
Sergeanur
ecdd751ec3 PC controls and icon 2021-01-08 16:57:22 +02:00
Sergeanur
ead2a1a606 MemoryManager of base:: 2021-01-08 16:47:41 +02: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
aap
37a58a04f2 timecycle; some rendering 2021-01-08 13:34:49 +01: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
6b0fa20b8b Make opus available alongside other formats 2021-01-07 22:01:44 +02:00
Sergeanur
c2672bd630 Fix char in stats 2021-01-07 21:00:20 +02:00
Nikolay Korolev
5e10f1fe6a sync with upstream 2021-01-07 18:38:40 +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
Sergeanur
a51757429e Implementing our own WAV decoder to replace SndFile 2021-01-06 15:52:12 +02:00
erorcun
bafaa6acc6 sand fix 2021-01-05 18:53:00 +03:00
aap
33fd33b03a fix to !PC_PLAYER_CONTROLS 2021-01-04 23:29:23 +01:00
Sergeanur
4f9bfb4387 Fix missing ifdef 2021-01-04 21:55:41 +02:00
erorcun
ae388c48d0 cfo fix 2021-01-04 16:05:49 +03:00
Sergeanur
1efbd7ead2 Fix unlimited rotation in Phnom Penh '86 2021-01-04 10:58:12 +02:00
erorcun
5b081398b5 Frontend: disable windowed mode selector while in game 2021-01-03 22:00:25 +03:00
Sergeanur
30bc51ae9e Pad2 fix 2021-01-02 13:42:49 +02:00
Sergeanur
42e4a068bb CVarConsole 2021-01-02 13:32:25 +02:00
Sergeanur
e7c46ac658 Partial controller buttons support 2021-01-02 12:51:09 +02:00
Nikolay Korolev
b4b9f9601b Merge branch 'miami' into lcs-dev 2021-01-01 14:55:00 +03:00
Nikolay Korolev
4604b45852 Merge remote-tracking branch 'upstream/miami' into miami 2021-01-01 14:53:37 +03:00
Nikolay Korolev
9fd93e8e57 merge master to miami 2021-01-01 14:53:20 +03:00
Sergeanur
ccf6232039 small CWorld fixes 2021-01-01 12:47:22 +02:00