d83b8cf940
Merge branch 'miami' into lcs
...
# Conflicts:
# src/renderer/Hud.cpp
2021-07-25 21:01:00 +03:00
b69222e017
friggin the riggin
2021-07-25 11:58:03 +03:00
dc729009ac
Merge remote-tracking branch 'upstream/lcs' into lcs
2021-07-24 01:02:23 +03:00
a7e673c2ec
sync
2021-07-24 00:47:04 +03:00
aec797671e
Fix aiming with minigun and flamethrower with PC controls
2021-07-22 22:15:27 +03:00
cc13e31264
Merge branch 'miami' into lcs
2021-07-22 21:17:55 +03:00
76558e9313
fix garbage data written in garage save block
2021-07-19 23:44:01 +02:00
a437d2bc26
fix garbage data written in garage save block
2021-07-19 23:43:51 +02:00
8018e40ebf
Merge pull request #1217 from Nopey/master
...
Fix debug script loader crashing missions
2021-07-15 23:09:28 +02:00
91d958bf27
Merge remote-tracking branch 'upstream/lcs' into lcs
2021-07-12 10:32:01 +03:00
55d30a11ec
Merge branch 'miami' into lcs
...
# Conflicts:
# README.md
# gamefiles/TEXT/american.gxt
# gamefiles/TEXT/french.gxt
# gamefiles/TEXT/german.gxt
# gamefiles/TEXT/italian.gxt
# gamefiles/TEXT/spanish.gxt
# src/audio/AudioManager.h
# src/control/Garages.cpp
# src/control/Garages.h
# src/control/Script5.cpp
# src/core/config.h
# utils/gxt/american.txt
# utils/gxt/spanish.txt
2021-07-12 04:13:22 +03:00
a8fd3f828a
Merge pull request #1149 from withmorten/saves
...
finish COMPATIBLE_SAVES and FIX_INCOMPATIBLE_SAVES
2021-07-12 01:06:59 +03:00
2a6f9c2757
Add ped and car density slider to menu, remove dumb collision "optimization"
2021-07-12 00:12:25 +03:00
776d46aacb
Merge remote-tracking branch 'upstream/lcs' into lcs
2021-07-11 10:23:59 +03:00
12efd1209b
Fix Cheat menu debug script loader
2021-07-10 10:18:32 -07:00
33c45e4ae0
Fix debug script loader crashing missions
...
* open_script is now exposed in Script.h, perhaps it should be namespaced
as a static method on CTheScripts? I'm unsure what is preferred.
* I've moved the joypad code out of open_script to prevent buttons held
down at mission load time from changing the scriptToLoad.
2021-07-10 09:34:17 -07:00
011aafa043
finish COMPATIBLE_SAVES and FIX_INCOMPATIBLE_SAVES
2021-07-10 17:30:27 +02:00
6f103a3b82
finish COMPATIBLE_SAVES and FIX_INCOMPATIBLE_SAVES
2021-07-10 02:06:43 +02:00
d781db6c0f
Merge branch 'miami' into lcs
...
# Conflicts:
# README.md
# premake5.lua
2021-07-09 00:05:26 +03:00
72f6780905
Use CPad functions to check key states in script loader
2021-07-08 03:37:14 +03:00
47f153fe76
Use CPad functions to check key states in script loader
2021-07-08 03:24:47 +03:00
79c010f082
fix macro redefinition warnings on win-glfw build
2021-07-08 01:44:55 +02:00
f9a2f1daf7
fix macro redefinition warnings on win-glfw build
2021-07-08 01:40:58 +02:00
62425b5866
Merge remote-tracking branch 'upstream/lcs' into lcs
2021-07-04 15:24:54 +03:00
5d5e0f62e8
Merge branch 'miami' into lcs
...
# Conflicts:
# premake5.lua
2021-07-03 16:39:22 +03:00
10cc444482
Merge remote-tracking branch 'upstream/lcs' into lcs
2021-07-02 11:28:46 +03:00
987e09515b
Fix use of integer in RemoveBuildingsNotInArea call
2021-07-02 10:33:45 +03:00
9ea3549743
GameLogic - type fixes
2021-07-02 10:30:39 +03:00
ae4bfef590
Refactor OnscreenTimer
2021-07-02 10:22:34 +03:00
7df71c9673
Refactor OnscreenTimer
2021-07-02 10:18:22 +03:00
138abb91f6
Merge branch 'miami' into lcs
...
# Conflicts:
# src/control/CarCtrl.cpp
# src/control/Script4.cpp
# src/core/Frontend.cpp
2021-06-30 21:26:36 +03:00
d17d437de3
rename clamp macro to Clamp to fix compilation with g++11 (and clamp2 for consistency sake)
2021-06-28 13:57:05 +02:00
cb3b3855b8
rename clamp macro to Clamp to fix compilation with g++11
2021-06-28 13:31:35 +02:00
1c5a864598
Fix script load
2021-06-28 05:23:58 +03:00
eaebaa6db3
Merge branch 'miami' into lcs
...
# Conflicts:
# src/control/Script5.cpp
# src/entities/Entity.cpp
2021-06-28 05:16:21 +03:00
f8297df9c5
Redo ReadSaveBuf + common.h cleanup
2021-06-28 05:12:54 +03:00
f3a931e1c9
Revert "Revert "Redo ReadSaveBuf + common.h cleanup""
...
This reverts commit af7573ddbe
2021-06-26 19:14:46 +02:00
636f67ca3f
Merge remote-tracking branch 'upstream/lcs' into lcs
2021-06-26 14:34:52 +03:00
831737ecc8
Fixes
2021-06-26 14:25:40 +03:00
af7573ddbe
Revert "Redo ReadSaveBuf + common.h cleanup"
...
This reverts commit 2b67aba94c
2021-06-26 00:25:59 +03:00
2b67aba94c
Redo ReadSaveBuf + common.h cleanup
2021-06-25 19:03:51 +03:00
8a5afd0db2
sync
2021-06-25 10:15:19 +03:00
74867af2e7
Fixes
2021-06-24 21:50:09 +03:00
3aac4ea62a
Fix sin & cos calls
2021-06-24 21:45:48 +03:00
1fa0116f5f
Use bool8 in audio code
2021-06-24 21:44:36 +03:00
c7821635fd
Wait states ported (scripted animations)
2021-06-24 21:42:10 +03:00
1471c82a20
LCS sfx + mission audio
2021-06-24 21:42:08 +03:00
6e4a2947ea
Fix sin & cos calls
2021-06-24 21:34:33 +03:00
5bcdb933a7
Use bool8 in audio code
2021-06-24 21:34:32 +03:00
68b5270fe4
Fix some timer calls
2021-06-24 21:32:43 +03:00
