Commit Graph

1232 Commits

Author SHA1 Message Date
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
824ca7599c wtf 2021-01-08 13:07:36 +03:00
f8569a74cb fix 2021-01-08 12:59:51 +03:00
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
24d73aeb71 Fix garage messages position 2021-01-08 00:04:38 +02:00
0428b5b694 Fix pickup text 2021-01-07 21:55:41 +02:00
5e10f1fe6a sync with upstream 2021-01-07 18:38:40 +03:00
9d6db921bd fail 2021-01-07 18:31:54 +03:00
db1bdfd62d minor refactoring 2021-01-07 18:30:35 +03:00
69d30f2204 some lcs stuff 2021-01-07 15:21:35 +03:00
f61e2d04f1 GET_WHEELIE_STATS fix 2021-01-06 11:56:13 -08:00
6fa081e004 fix 2021-01-05 00:48:25 +03:00
1efbd7ead2 Fix unlimited rotation in Phnom Penh '86 2021-01-04 10:58:12 +02:00
33f467453e dumb 2021-01-03 23:36:32 +03:00
bec8f6b86c reorder 2021-01-03 22:29:16 +03:00
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
06fd054eb3 fixed intro text line defaults 2021-01-03 18:56:05 +03:00
5e019ed9f8 fixed array size 2021-01-03 13:57:27 +03:00
29e0cfa98b fix 2021-01-03 12:52:26 +03:00
aap
57677b7b55 slightly better variable name 2021-01-02 20:30:16 +01:00
42e4a068bb CVarConsole 2021-01-02 13:32:25 +02:00
c75c4603fc bad stuff 2021-01-01 23:06:20 +03:00
29b76fc4f5 small thing 2021-01-01 22:57:17 +03:00
b4b9f9601b Merge branch 'miami' into lcs-dev 2021-01-01 14:55:00 +03:00
9fd93e8e57 merge master to miami 2021-01-01 14:53:20 +03:00
2f05c64470 actual struct name 2021-01-01 13:35:23 +03:00
575845772f Merge branch 'miami' into lcs-dev 2021-01-01 13:21:42 +03:00
56ea1c7be7 fixed some bugs (saves might be broken though) 2020-12-31 19:29:13 +03:00
9c2f1b0833 More bike leftovers 2020-12-28 14:00:44 +02:00
149aef929d fixed replay 2020-12-26 12:56:20 +03:00
e00b8a93bf Fix use of strncmp 2020-12-25 15:18:48 +02:00
b12eef1d56 Fix use of strncmp 2020-12-25 15:18:13 +02:00
5f98b4fdca Merge remote-tracking branch 'upstream/miami' into miami 2020-12-25 12:12:09 +03:00
86f04884de fix garage 2020-12-25 12:11:22 +03:00
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
de31bdc89f Small type use fixes 2020-12-25 08:59:32 +02:00
dcb28bfd53 fix 2020-12-20 17:12:34 +03:00
fc72ff24d0 implemented collectives in script 2020-12-20 17:07:58 +03:00
0bea6d039b Merge branch 'master' of https://github.com/GTAmodding/re3 2020-12-19 22:33:17 +03:00
140fa2a21c restore original code, fixes, ps2 font 2020-12-19 21:25:45 +03:00
76a564df2e fixed review stuff 2020-12-19 14:33:22 +03:00
8d1996833b merge attempt 2020-12-19 03:21:04 +03:00
aap
55cf1a37cb Merge branch 'miami' of github.com:GTAmodding/re3 into miami 2020-12-18 13:50:37 +01:00
aap
a7050458ae little cleanup and synch on templates and config 2020-12-18 13:50:26 +01:00
cfda5eb148 PlayerInfo functions reordered into original order, FindPlayer... functions moved to PlayerInfo, improved CVector <-> RwV3d conversion, small fixes 2020-12-18 02:58:09 +02:00
e9a5670348 PlayerInfo functions reordered into original order, FindPlayer... functions moved to PlayerInfo, improved CVector <-> RwV3d conversion, small fixes 2020-12-18 02:57:54 +02:00
2903ebe296 Fix placement of some script functions
# Conflicts:
#	src/control/Script5.cpp
2020-12-16 23:29:17 +02:00
9a9b1e7574 Fix placement of some script functions 2020-12-16 23:28:06 +02:00