Commit Graph

389 Commits

Author SHA1 Message Date
613d08d3e2 Merge branch 'lcs-dev' into lcs 2021-01-08 18:59:14 +03:00
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
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
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
bec8f6b86c reorder 2021-01-03 22:29:16 +03:00
aap
57677b7b55 slightly better variable name 2021-01-02 20:30:16 +01:00
29b76fc4f5 small thing 2021-01-01 22:57:17 +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
56ea1c7be7 fixed some bugs (saves might be broken though) 2020-12-31 19:29:13 +03:00
fc72ff24d0 implemented collectives in script 2020-12-20 17:07:58 +03:00
8d1996833b merge attempt 2020-12-19 03:21:04 +03:00
0563478de0 Fix some formatting issues 2020-12-14 11:18:46 +02:00
4197498e2d fixed garages + minor fixes 2020-12-12 12:24:55 +03:00
4c0744260d uint8 enums fixed 2020-12-07 01:59:17 +01:00
4696e3f9c8 uint8 enums fixed 2020-12-07 00:36:40 +01:00
0bd373cd56 script from other platforms and unused commands 2020-12-05 02:49:32 +03:00
aap
d5bc382cb5 GTA_VERSION define and some config.h cleanup 2020-11-29 21:29:48 +01:00
b47c505438 Update Script.cpp
Case sensitivity fix. Causes compile issue on linux.
2020-11-28 13:36:38 +02:00
a35b3b4602 Script commands split to original files 2020-11-24 14:06:48 +02:00
bd3d09fef5 Script commands split to original files 2020-11-24 12:58:11 +02:00
abcda2ce29 add mission switcher from miami 2020-11-16 00:41:03 +01:00
6682e56f71 small fix 2020-11-13 17:53:03 +03:00
984708dfd3 damn 2020-11-11 13:36:10 +03:00
e473123a6a fixes 2020-11-03 00:07:25 +03:00
0ccc70c843 embarassing 2020-11-02 23:53:52 +03:00
bae6c24209 fix 2020-11-02 15:54:42 +03:00
5edd9e75da finished script and replay 2020-11-01 18:21:05 +03:00
45c09224f7 fixed KYFC 2020-11-01 16:34:39 +03:00
63a27fbc5f overflow fix 2020-11-01 13:55:29 +03:00
f21cfef8fb remove autosave at end of mission under MISSION_REPLAY 2020-11-01 12:33:16 +03:00
ca497e2cbd ScriptSounds 2020-10-23 16:56:34 +03:00
d7b9884f9d Use audio enum 2020-10-23 16:18:46 +03:00
0750f04019 Messages, fix Font 2020-10-20 22:24:56 +03:00
10758088ef Merge pull request #766 from Fire-Head/miami
Glass
2020-10-18 19:59:11 +03:00
70f9832e14 Merge branch 'miami' into miami 2020-10-18 19:45:11 +03:00
0d20f1c364 Merge branch 'master' into miami
# Conflicts:
#	src/audio/AudioLogic.cpp
#	src/control/RoadBlocks.cpp
#	src/entities/Entity.h
#	src/entities/Physical.cpp
#	src/peds/Ped.cpp
#	src/render/Renderer.cpp
#	src/vehicles/Automobile.cpp
#	src/vehicles/CarGen.cpp
#	src/weapons/BulletInfo.cpp
#	src/weapons/Weapon.cpp
2020-10-18 17:15:49 +03:00
cc0ae51631 lil fix 2020-10-18 16:55:11 +03:00
b91f6a4550 Setter for bIsStatic (became virtual in SA) 2020-10-18 16:40:06 +03:00
cafe4e38db Script.cpp missing breaks 2020-10-18 13:37:17 +03:00
82f54b946f Script.cpp missing breaks 2020-10-18 00:56:07 +02:00
e4ac934dbf Miami Glass 2020-10-15 00:33:57 +03:00
c4d4821327 Control updates 2020-10-11 12:56:33 +03:00
881db86895 CSpecialFX and some other classes 2020-10-09 20:29:38 +03:00
da39624f1c Pad, BulletInfo, ProjectileInfo, fixes 2020-10-08 00:26:24 +03:00
1666995cd9 fixed bad bug 2020-09-30 16:29:39 +03:00