Commit Graph

149 Commits

Author SHA1 Message Date
aap
ce7f166ba3 CVehicleModelInfo 2021-01-24 22:50:16 +01:00
aap
a202e67349 CPedModelInfo and CTempColModels 2021-01-24 17:14:16 +01:00
Sergeanur
904090cbb6 Merge remote-tracking branch 'origin/miami' into lcs
# Conflicts:
#	src/modelinfo/BaseModelInfo.cpp
2021-01-23 15:14:15 +02:00
Sergeanur
cfac29b0ef Remove restrictions in CGame::Process 2021-01-23 15:09:34 +02:00
erorcun
f85b5e99ed Includes overhaul, fix some compiler warnings 2021-01-23 03:23:16 +03:00
Sergeanur
cea6b20c09 Merge remote-tracking branch 'origin/miami' into lcs
# Conflicts:
#	src/animation/CutsceneMgr.cpp
#	src/control/CarCtrl.cpp
#	src/control/Script.cpp
#	src/control/Script2.cpp
#	src/core/Frontend.cpp
#	src/core/main.cpp
#	src/entities/Physical.cpp
#	src/peds/Ped.cpp
#	src/peds/PedAI.cpp
#	src/text/Messages.cpp
#	src/vehicles/Cranes.cpp
#	src/vehicles/Transmission.cpp
2021-01-22 15:04:09 +02:00
withmorten
feb993e751 get rid of most --MIAMI comments 2021-01-22 11:43:29 +01:00
Sergeanur
cc94419a72 Merge branch 'miami' into lcs
# Conflicts:
#	src/control/Script.cpp
#	src/control/Script4.cpp
#	src/render/Weather.cpp
#	src/render/Weather.h
#	src/vehicles/Automobile.cpp
2021-01-20 19:32:03 +02:00
withmorten
d5ce8b1ea3 add the bad crack "features" behind SECUROM define 2021-01-14 23:16:42 +01:00
Sergeanur
94f25a429f Merge remote-tracking branch 'origin/miami' into lcs
* origin/miami:
  more securom fixes
  move stuff back into class; securom comments
  More font fixes
  fix
  fix CreateInstance virtual overload order
  escalator fix
  ProcessWheel bug
2021-01-13 02:08:13 +02:00
withmorten
232d990e6d move stuff back into class; securom comments 2021-01-13 00:18:58 +01:00
Nikolay Korolev
203dff9165 script 2021-01-09 20:33:21 +03:00
Sergeanur
e9001207ea Disable water creatures 2021-01-08 18:26:35 +02:00
aap
ebdf08a514 first commit for LCS 2021-01-08 01:41:40 +01:00
Sergeanur
42e4a068bb CVarConsole 2021-01-02 13:32:25 +02:00
aap
426364b961 fix custom pipes mem leak 2020-12-29 20:31:06 +01:00
erorcun
9e7cb046b3 move cfo populate func. 2020-12-27 23:46:15 +03:00
aap
f60b450ee8 main.cpp mostly checked against ps2 now 2020-12-20 19:13:37 +01:00
aap
b48445cc7e Merge branch 'miami' of github.com:GTAmodding/re3 into miami 2020-12-20 14:27:56 +01:00
aap
fc312113d2 some PS2 things 2020-12-20 14:27:48 +01:00
Sergeanur
2e90ce9cc5 uncomment InitRadioStationPositionList 2020-12-20 13:41:29 +02:00
Nikolay Korolev
76a564df2e fixed review stuff 2020-12-19 14:33:22 +03:00
Nikolay Korolev
8d1996833b merge attempt 2020-12-19 03:21:04 +03:00
aap
a7050458ae little cleanup and synch on templates and config 2020-12-18 13:50:26 +01:00
aap
35cac6b93b some rendering things 2020-12-13 12:53:19 +01:00
aap
9714a37769 bit more GTA_VERSION and GTA_PS2 2020-12-04 01:12:58 +01:00
aap
5bed7afd79 forgot some junk 2020-12-03 16:56:32 +01:00
aap
13cefd3293 more PS2 stuff; memory movement done 2020-12-03 16:04:59 +01:00
Nikolay Korolev
fda58fb1df added GTA_SCENE_EDIT 2020-12-02 02:34:51 +03:00
Sergeanur
a259b6b8ab TexturePools
# Conflicts:
#	src/core/Game.cpp
#	src/rw/RwHelper.cpp
2020-12-01 22:54:19 +02:00
Sergeanur
0b20fd7e77 Remove ifndef GTA_PS2 around replays 2020-12-01 22:35:53 +02:00
Sergeanur
9461998304 TexturePools 2020-12-01 22:12:46 +02:00
aap
83bbb631d1 some more GTA_VERSIONs and CGame tidy-up (not much actual memory moving yet) 2020-12-01 17:42:18 +01:00
aap
2c59e1c894 some more GTA_VERSION 2020-12-01 00:22:57 +01:00
aap
d857758c16 start using CMemoryHeap 2020-11-26 17:39:59 +01:00
erorcun
b7783b19d2 Xbox message screen, disabled by default 2020-11-24 01:45:54 +03:00
aap
07fe099b4e neo screen droplets 2020-11-19 19:07:32 +01:00
aap
02c7f8381b neo screen droplets 2020-11-19 16:23:52 +01:00
erorcun
59f9c009ef Font: Hud: Use orig. text dimensions, fix right-align calculations 2020-11-10 01:50:34 +03:00
erorcun
f8367ebdef Revert "Font: Fix text dimensions"
This reverts commit 6729de49b1.
2020-11-08 21:11:55 +03:00
erorcun
fe5d0c9cdf Font: Hud: Use orig. text dimensions, fix right-align calculations 2020-11-08 20:49:47 +03:00
erorcun
922d06ab1f rewrite CFO + postfx/pipeline options 2020-10-28 15:05:04 +03:00
erorcun
6729de49b1 Font: Fix text dimensions 2020-10-25 20:57:24 +03:00
Sergeanur
e0394e6e69 Possible fix of linux build 2020-10-25 12:38:08 +02:00
Sergeanur
aac0c3fb67 DMAudio fixes 2020-10-25 09:40:11 +02:00
majestic
e7ef45a606 CWaterCreatures 2020-10-10 17:49:54 -07:00
eray orçunus
3bd3330227 Load and write our settings in re3.ini & fixes 2020-10-02 21:18:34 +03:00
eray orçunus
595421da39 Fixes, mouse AUX buttons, joystick detect menu 2020-09-30 20:03:01 +03:00
Sergeanur
4f4b1f9145 cMusicManager, cDMAudio, radio position save/load, a few commands implemented 2020-09-09 19:37:44 +03:00
eray orçunus
3e549a7d44 CGame done, Peds, fixes 2020-08-30 12:40:30 +03:00