Commit Graph

4229 Commits

Author SHA1 Message Date
aap
bfb749d842 ps2 fixes 2020-12-20 17:35:37 +01:00
erorcun
9e1e5d200a disabled PS2_HUD by default 2020-12-20 18:16:56 +03:00
Nikolay Korolev
dcb28bfd53 fix 2020-12-20 17:12:34 +03:00
Nikolay Korolev
db012aa9e0 Merge remote-tracking branch 'upstream/master' 2020-12-20 17:08:21 +03:00
Nikolay Korolev
fc72ff24d0 implemented collectives in script 2020-12-20 17:07:58 +03:00
aap
30c8f870eb little ps2 fixes 2020-12-20 14:28:09 +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
Sergeanur
be92b57b54 buildings directory
# Conflicts:
#	premake5.lua
2020-12-20 12:40:59 +02:00
Sergeanur
affd3c6baa buildings directory 2020-12-20 12:39:44 +02:00
aap
6697ab6b63
Merge pull request #890 from aap/miami
anim compression
2020-12-20 11:31:22 +01:00
erorcun
ae7cb92437 fixes to last HUD commits 2020-12-20 05:49:55 +03:00
Fire-Head
0bea6d039b Merge branch 'master' of https://github.com/GTAmodding/re3 2020-12-19 22:33:17 +03:00
Fire-Head
4d4758bc1e scaling 2020-12-19 22:31:54 +03:00
Fire-Head
140fa2a21c restore original code, fixes, ps2 font 2020-12-19 21:25:45 +03:00
erorcun
4c46d24983
style change 2020-12-19 20:39:42 +03:00
aap
2a51e1da04 Merge branch 'miami' of github.com:GTAmodding/re3 into miami 2020-12-19 17:27:01 +01:00
Nikolay
867133e93d
Merge pull request #891 from Nick007J/miami
merge master to miami
2020-12-19 19:15:52 +03:00
Nikolay Korolev
b6298915dd fixed cmakelists 2020-12-19 16:21:33 +03:00
Nikolay Korolev
196a13b1cc removed renderer stuff 2020-12-19 14:52:32 +03:00
Nikolay Korolev
76a564df2e fixed review stuff 2020-12-19 14:33:22 +03:00
Nikolay Korolev
17efc38e35 removed cullzones stuff from renderer 2020-12-19 12:27:16 +03:00
Nikolay Korolev
bf90fed2b7 fixes 2020-12-19 11:49:19 +03:00
Nikolay Korolev
e3aac6263f Merge remote-tracking branch 'upstream/miami' into miami 2020-12-19 03:21:32 +03:00
Nikolay Korolev
8d1996833b merge attempt 2020-12-19 03:21:04 +03:00
aap
df5bafc80c anim fixes 2020-12-18 23:47:38 +01:00
aap
9982f1f21b anim compression 2020-12-18 23:46:51 +01:00
aap
73d080bcc8 silly mistake 2020-12-18 23:39:59 +01:00
aap
c17ccc50ab get rid of all PED_SKIN defines 2020-12-18 17:27:18 +01:00
aap
75a9976cbc memorymgr fix 2020-12-18 14:33:54 +01:00
aap
f3a356375e added MemoryHeap from III, MemoryMgr 2020-12-18 14:19:03 +01:00
aap
a080fbfbd4 little cleanup of templates 2020-12-18 13:58:59 +01: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
aap
db752d141b
Merge pull request #889 from aap/miami
CMBlur FX
2020-12-18 13:31:24 +01:00
Sergeanur
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
Sergeanur
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
aap
cc5af26417 PreAllocateRwObjects 2020-12-17 12:47:00 +01:00
erorcun
dd579c4080 Fix 2020-12-17 02:47:48 +03:00
Sergeanur
2903ebe296 Fix placement of some script functions
# Conflicts:
#	src/control/Script5.cpp
2020-12-16 23:29:17 +02:00
Sergeanur
9a9b1e7574 Fix placement of some script functions 2020-12-16 23:28:06 +02:00
aap
1af5065df7 Merge branch 'miami' of github.com:GTAmodding/re3 into miami 2020-12-16 21:54:01 +01:00
aap
e9df32a983 finished CMBlur 2020-12-16 21:53:47 +01:00
erorcun
8e45439205 Use scrolling if GRAPHICS_MENU_OPTIONS not defined, like miami 2020-12-16 23:45:18 +03:00
erorcun
12d16ddc06 Fixes and style changes 2020-12-16 23:28:25 +03:00
aap
387a6a0877 update librw 2020-12-16 15:49:51 +01:00
aap
9200810f60 update librw with stencil states 2020-12-16 15:49:22 +01:00
aap
7d89e955fe ;end of fucking waterlevel 2020-12-16 13:38:09 +01:00
aap
c42463bf4e more tidy water sync 2020-12-16 13:32:13 +01:00