Commit graph

40 commits

Author SHA1 Message Date
withmorten
feb993e751 get rid of most --MIAMI comments 2021-01-22 11:43:29 +01:00
Nikolay Korolev
9fd93e8e57 merge master to miami 2021-01-01 14:53:20 +03:00
Nikolay Korolev
4197498e2d fixed garages + minor fixes 2020-12-12 12:24:55 +03:00
Fire-Head
c5fbb594a5 ps2 hud, restore original code 2020-12-07 21:12:13 +03:00
Sergeanur
3289bfaa87 Darkel done 2020-11-22 23:18:35 +02:00
erorcun
fe5d0c9cdf Font: Hud: Use orig. text dimensions, fix right-align calculations 2020-11-08 20:49:47 +03:00
erorcun
6729de49b1 Font: Fix text dimensions 2020-10-25 20:57:24 +03:00
Nikolay Korolev
40434eadfd small fix 2020-10-17 12:31:14 +03:00
Nikolay Korolev
49ad471b2d removed extra header 2020-10-11 12:58:23 +03:00
Nikolay Korolev
552f308e9e sync with upstream 2020-10-11 12:58:11 +03:00
Nikolay Korolev
c4d4821327 Control updates 2020-10-11 12:56:33 +03:00
Sergeanur
f1bb09826d Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
#	gamefiles/TEXT/american.gxt
#	premake5.lua
#	src/audio/MusicManager.cpp
#	src/control/Darkel.cpp
#	src/control/Script.cpp
#	src/core/FileLoader.cpp
#	src/core/Frontend.cpp
#	src/core/Game.cpp
#	src/core/Streaming.cpp
#	src/core/config.h
#	src/core/re3.cpp
#	src/extras/frontendoption.cpp
#	src/extras/frontendoption.h
#	src/render/Hud.cpp
#	src/skel/glfw/glfw.cpp
#	src/vehicles/CarGen.cpp
#	src/vehicles/Vehicle.cpp
#	src/weapons/WeaponInfo.cpp
#	utils/gxt/american.txt
2020-10-11 01:18:08 +03:00
Nikolay Korolev
2bfb54b192 fixed darkel/replay 2020-10-05 16:09:44 +03:00
Sergeanur
9956b27767 Merge branch 'master' into miami
# Conflicts:
#	src/control/Darkel.cpp
#	src/core/main.cpp
2020-08-15 15:13:46 +03:00
Sergeanur
489743da41 Darkel fixes 2020-08-14 17:34:04 +03:00
Dominik
fa1263b6a4
CDarkel miami hud colors. 2020-07-07 01:02:39 +02:00
Fire-Head
9c0adf6a8f Revert "FONT_BANK renamed to FONT_STANDARD"
This reverts commit 552205dfba.
2020-06-07 05:03:06 +03:00
Sergeanur
1c01899799 Merge branch 'master' into miami
# Conflicts:
#	src/control/Garages.cpp
#	src/core/Frontend.cpp
#	src/peds/PlayerPed.cpp
#	src/render/Hud.cpp
#	src/vehicles/Train.cpp
2020-06-07 04:15:10 +03:00
Sergeanur
552205dfba FONT_BANK renamed to FONT_STANDARD 2020-06-07 04:10:06 +03:00
Nikolay Korolev
c1c163d78c game logic 2020-05-31 20:59:01 +03:00
Filip Gawin
370c4e48cd Try to build with mingw 2020-04-20 18:18:46 +02:00
Sergeanur
599164006a Remove patches 2020-04-17 16:31:11 +03:00
eray orçunus
2c2da558ca Some refs removed, little fixes and teleport 2020-04-16 22:19:56 +03:00
Sergeanur
97ffa1a658 Wrappers cleanup 2020-03-29 08:58:08 +03:00
eray orçunus
112685ebac CCopPed done and #include cleanup 2020-03-28 18:52:25 +03:00
Sergeanur
208754ac68 Finishing CDarkel 2020-01-07 17:30:29 +02:00
Sergeanur
26c8c56623 Fixed unsigned time check in CDarkel 2019-10-13 22:44:39 +03:00
eray orçunus
d5d1c7ec5f Peds 2019-10-07 00:39:25 +03:00
eray orçunus
aa4e7ad5eb CDarkel, walkaround fix 2019-10-05 17:06:01 +03:00
eray orçunus
875cdd845d The Peds 2019-08-02 01:30:40 +03:00
eray orçunus
59671fab03 The Peds, mainly dying/injuring
There is also some reorganization
2019-07-18 05:27:29 +03:00
aap
60711154ba more CWanted; added CEventList 2019-07-12 18:01:22 +02:00
aap
a65dd41da7 yet more CAutomobile 2019-07-09 18:50:35 +02:00
_AG
439f371fc3 Darkel is bored. 2019-07-07 20:59:49 +02:00
_AG
29767c1964 Lil update. 2019-07-07 09:13:14 +02:00
_AG
9fed0c040c Darkel/Wanted update. 2019-07-04 22:33:19 +02:00
_AG
f3c331ece6 Code clean up. 2019-06-20 15:18:19 +02:00
_AG
f299e9ebd5 Update HUD stuff, bug and format fixes.
Added environment variables to premake5.lua.
Update README.md
2019-06-17 02:11:30 +02:00
_AG
92cc1cf3af New updates for Hud.cpp and more. 2019-06-15 01:34:36 +02:00
aap
188aab4196 implemented some higher level functions; added lots of stubs; switched top and bottom in CRect 2019-05-30 21:24:47 +02:00