Commit graph

1564 commits

Author SHA1 Message Date
Fire-Head
3e6016dc6e Merge branch 'lcs' of https://github.com/GTAmodding/re3 into lcs 2021-01-13 00:11:15 +03:00
Fire-Head
096db533a6 rem gMakeResources 2021-01-13 00:09:40 +03:00
Fire-Head
3648ef4687 lcs particle 2021-01-13 00:07:24 +03:00
Sergeanur
f73e870bde Merge remote-tracking branch 'origin/miami' into lcs
* origin/miami:
  bug of the decade
  big oof
  colmodel fix
2021-01-12 22:29:50 +02:00
aap
0afa027ab4 bug of the decade 2021-01-12 21:28:13 +01:00
aap
55320a03f1 little cleanup of vehicle rendering 2021-01-12 14:07:24 +01:00
aap
9b2037419f mobile vehicle rendering 2021-01-12 13:41:29 +01:00
Sergeanur
8888ee3974
Merge pull request #948 from Sergeanur/lcsPR/CutsceneMgr
CutsceneMgr done + use original VB audio + make interiors visible + use hashed model info names a bit
2021-01-12 13:22:44 +02:00
Sergeanur
cb4b4d584c Merge branch 'miami' into lcs
# Conflicts:
#	src/control/Script.cpp
#	src/control/Script3.cpp
#	src/extras/custompipes_d3d9.cpp
#	src/extras/custompipes_gl.cpp
2021-01-12 12:55:07 +02:00
Nikolay Korolev
7496a463d4 Merge branch 'lcs-dev' into lcs 2021-01-12 00:42:44 +03:00
Nikolay Korolev
091b40cb39 script3.cpp 2021-01-12 00:42:11 +03:00
aap
383142bcbe some useless code 2021-01-11 20:20:08 +01:00
Sergeanur
a223157000 CutsceneMgr done + use original VB audio + make interiors visible + use hashed model info names a bit 2021-01-11 19:53:15 +02:00
withmorten
4a8a1af885 fix CPed struct, GetWantedLevel 2021-01-11 18:43:04 +01:00
Nikolay Korolev
4422a3df23 Merge branch 'lcs-dev' into lcs 2021-01-11 17:26:17 +03:00
Nikolay Korolev
625376f0d3 500-599 2021-01-11 17:14:56 +03:00
Nikolay Korolev
cf11b32849 of course 2021-01-11 02:43:57 +03:00
Nikolay Korolev
53a99cb9ee script2 2021-01-11 02:35:03 +03:00
aap
ca64363899 debugmenu vehicle spawn list 2021-01-10 19:58:58 +01:00
aap
93ea98520b mobile building rendering 2021-01-10 19:45:58 +01:00
aap
ebca91e0d0 update librw 2021-01-10 18:43:44 +01:00
aap
c631e6c61c env map tweaks 2021-01-10 14:32:37 +01:00
aap
0ee87d7b46 env map rendering 2021-01-10 11:59:57 +01:00
Nikolay
b0e395e853
Merge pull request #942 from majesticCoding/lcs
just original marker's colors
2021-01-10 13:44:40 +03:00
Nikolay Korolev
f5b97f1e8a can finish first mission 2021-01-09 22:24:18 +03:00
majestic
2639fba582 just original marker color 2021-01-09 10:26:07 -08:00
aap
03c5fdef43 moved new renderer; implemented leeds building rendering 2021-01-09 19:20:32 +01:00
Nikolay Korolev
203dff9165 script 2021-01-09 20:33:21 +03:00
Nikolay Korolev
1f79fb608a fix 2021-01-09 17:47:55 +03:00
Nikolay Korolev
a38d0a0fbd Merge branch 'lcs-dev' into lcs 2021-01-09 17:35:57 +03:00
Nikolay Korolev
b32301592f Merge remote-tracking branch 'upstream/lcs' into lcs 2021-01-09 17:35:52 +03:00
Nikolay Korolev
97c95b7639 more script 2021-01-09 17:35:27 +03:00
Sergeanur
da10ce7b05 More linux fix 2021-01-09 13:33:45 +02:00
aap
e473d234fd cam sector fix 2021-01-09 12:11:34 +01:00
aap
7f5deb0f97 cam sector fix 2021-01-09 12:10:10 +01:00
aap
225b8953fd streaming fixes 2021-01-09 11:43:58 +01:00
Sergeanur
2ce925caba Sector sizes 2021-01-09 01:22:50 +02:00
Fire-Head
91c6389754 Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2021-01-09 01:02:17 +03:00
Fire-Head
7a3ee349da sync with re3
-radardisc shadow fix
-fix for the dimension where moon is round
-correct radar based on the early gta 3 screenshot
-proper scaling based on ps2 gta 3
-ini and debugmenu options
2021-01-09 01:01:41 +03:00
Nikolay Korolev
3ac74c86a1 fix 2021-01-09 00:33:16 +03:00
Nikolay Korolev
2bf88fcef5 Merge branch 'lcs' into lcs-dev 2021-01-09 00:30:13 +03:00
Sergeanur
b6875b41f4 Level 4 2021-01-08 23:20:52 +02:00
Nikolay Korolev
a9559f03b0 lcs script mode 2021-01-09 00:20:09 +03:00
Sergeanur
de13141b68 CKeyGen fixes 2021-01-08 22:39:25 +02:00
Sergeanur
af09cb06f5 Merge branch 'miami' into lcs
* miami:
  Use original names
2021-01-08 21:53:42 +02:00
Sergeanur
faa9e6441b Use original names 2021-01-08 21:53:11 +02:00
Sergeanur
079b8e0e16 CKeyGen 2021-01-08 20:51:31 +02:00
Sergeanur
4debd89d8e Merge branch 'miami' into lcs
# Conflicts:
#	src/render/Timecycle.cpp
2021-01-08 20:24:43 +02:00
Sergeanur
68e8c1ce04 Add multisampling 2021-01-08 20:22:08 +02:00
Sergeanur
bf3135eb41 Enable trains 2021-01-08 18:31:50 +02:00
Sergeanur
e9001207ea Disable water creatures 2021-01-08 18:26:35 +02:00
Nikolay Korolev
613d08d3e2 Merge branch 'lcs-dev' into lcs 2021-01-08 18:59:14 +03:00
Sergeanur
ecdd751ec3 PC controls and icon 2021-01-08 16:57:22 +02:00
Sergeanur
ead2a1a606 MemoryManager of base:: 2021-01-08 16:47:41 +02:00
aap
8be0567924 little fixes 2021-01-08 13:51:42 +01:00
aap
a99457ee29 fix phones 2021-01-08 13:51:31 +01:00
Sergeanur
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
aap
37a58a04f2 timecycle; some rendering 2021-01-08 13:34:49 +01:00
Nikolay Korolev
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
Sergeanur
6b0fa20b8b Make opus available alongside other formats 2021-01-07 22:01:44 +02:00
Sergeanur
c2672bd630 Fix char in stats 2021-01-07 21:00:20 +02:00
Nikolay Korolev
5e10f1fe6a sync with upstream 2021-01-07 18:38:40 +03:00
Nikolay Korolev
db1bdfd62d minor refactoring 2021-01-07 18:30:35 +03:00
Nikolay Korolev
69d30f2204 some lcs stuff 2021-01-07 15:21:35 +03:00
Sergeanur
a51757429e Implementing our own WAV decoder to replace SndFile 2021-01-06 15:52:12 +02:00
erorcun
bafaa6acc6 sand fix 2021-01-05 18:53:00 +03:00
aap
33fd33b03a fix to !PC_PLAYER_CONTROLS 2021-01-04 23:29:23 +01:00
Sergeanur
4f9bfb4387 Fix missing ifdef 2021-01-04 21:55:41 +02:00
erorcun
ae388c48d0 cfo fix 2021-01-04 16:05:49 +03:00
Sergeanur
1efbd7ead2 Fix unlimited rotation in Phnom Penh '86 2021-01-04 10:58:12 +02:00
erorcun
5b081398b5 Frontend: disable windowed mode selector while in game 2021-01-03 22:00:25 +03:00
Sergeanur
30bc51ae9e Pad2 fix 2021-01-02 13:42:49 +02:00
Sergeanur
42e4a068bb CVarConsole 2021-01-02 13:32:25 +02:00
Sergeanur
e7c46ac658 Partial controller buttons support 2021-01-02 12:51:09 +02:00
Nikolay Korolev
b4b9f9601b Merge branch 'miami' into lcs-dev 2021-01-01 14:55:00 +03:00
Nikolay Korolev
4604b45852 Merge remote-tracking branch 'upstream/miami' into miami 2021-01-01 14:53:37 +03:00
Nikolay Korolev
9fd93e8e57 merge master to miami 2021-01-01 14:53:20 +03:00
Sergeanur
ccf6232039 small CWorld fixes 2021-01-01 12:47:22 +02:00
Nikolay Korolev
575845772f Merge branch 'miami' into lcs-dev 2021-01-01 13:21:42 +03:00
aap
14eb16d5d4 remove superfluous CWorld:: 2020-12-31 22:03:42 +01:00
aap
31000fb4f0 remove superfluous CWorld:: 2020-12-31 22:03:37 +01:00
aap
4e7c2b90f7 mult -> div 2020-12-31 21:58:03 +01:00
aap
613bb72eb7 fix explosion 2020-12-31 21:57:52 +01:00
aap
426364b961 fix custom pipes mem leak 2020-12-29 20:31:06 +01:00
aap
14f7dbade8 fix custom pipes mem leak 2020-12-29 20:30:57 +01:00
Sergeanur
2bc843fdcd More menu error sound fix 2020-12-29 14:03:59 +02:00
Sergeanur
b9e97ab79d Reorder CEntity functions into their original order 2020-12-29 13:55:26 +02:00
Sergeanur
f75460fc1d Reorder CEntity functions into their original order 2020-12-29 13:55:15 +02:00
Sergeanur
c1caf380de
Merge pull request #904 from Sergeanur/bvf
Enable BIND_VEHICLE_FIREWEAPON with gta3.set size check
2020-12-29 08:49:39 +02:00
Sergeanur
06df781bca Fix error sound in when entering load/save menu 2020-12-29 08:31:38 +02:00
Fire-Head
ad560ffaf9 multiple instances sema fix 2020-12-28 23:13:20 +03:00
Fire-Head
8af298c668 multiple instances sema fix 2020-12-28 23:08:47 +03:00
Sergeanur
5ebcef2718 Use enum in frontend 2020-12-28 20:48:30 +02:00
Sergeanur
b9747de5d6 Enable BIND_VEHICLE_FIREWEAPON with gta3.set size check 2020-12-28 08:36:21 +02:00
erorcun
498d3a49ac just toggle waypoint 2020-12-28 00:15:05 +03:00
erorcun
38a1fef5c1 move cfo populate func. 2020-12-27 23:56:36 +03:00
erorcun
cd24936ca9 Dynamically add pipelines options, only if neo.txd exists 2020-12-27 23:55:13 +03:00
erorcun
2dbe3d5b83 fix 2020-12-27 23:54:21 +03:00
erorcun
9e7cb046b3 move cfo populate func. 2020-12-27 23:46:15 +03:00
erorcun
9afcc355ff Dynamically add pipelines options, only if neo.txd exists 2020-12-27 23:26:00 +03:00
aap
013e9b9992 fix backface culling 2020-12-27 19:53:10 +01:00
Sergeanur
7959b7fd1f NO_ISLAND_LOADING ported from re3 2020-12-27 18:26:30 +02:00
aap
5a74495d7b little hack to make new postfx not crash 2020-12-27 16:09:01 +01:00
erorcun
a4ec3cdf0b trivial fix 2020-12-27 06:03:38 +03:00
erorcun
0b59eeb2bf Fix default mouse invert setting, vert. mouse sensitivity, set aspect ratio auto as default 2020-12-27 05:59:51 +03:00
erorcun
36e64dbd22 signed/unsigned fixes, and some other fixes 2020-12-27 05:23:37 +03:00
aap
7613528e7e make screendrops independent of neo.txd; enable new rendering by default 2020-12-26 14:48:55 +01:00
aap
b21ca72c8b make screendrops independent of neo.txd; enable new rendering by default 2020-12-26 14:48:47 +01:00
aap
b41f93fcd6 garage cam fix 2020-12-26 13:45:53 +01:00
aap
688e277e89 fix mblur stencil 2020-12-26 13:02:30 +01:00
erorcun
57098a77ec Backface cull. in INI, mouse sensitivity fix, aspect ratio auto as default 2020-12-26 12:10:04 +03:00
Sergeanur
587c788ce3 Fix 2020-12-25 17:20:57 +02:00
Sergeanur
e00b8a93bf Fix use of strncmp 2020-12-25 15:18:48 +02:00
Sergeanur
b12eef1d56 Fix use of strncmp 2020-12-25 15:18:13 +02:00
erorcun
3b85457020
Merge pull request #894 from erorcun/miami
signed/unsigned fixes, and some other fixes
2020-12-25 12:56:31 +03:00
erorcun
a50244dc16 signed/unsigned fixes, and some other fixes 2020-12-25 12:54:41 +03:00
Sergeanur
e14ed9c7dd Restore original Cheat_strncmp 2020-12-25 10:44:20 +02:00
erorcun
f9cbe29c50
Merge pull request #886 from erorcun/master
Radio scroll to prev. station & radio off text
2020-12-24 20:47:26 +03:00
aap
aefaa17a84 Merge branch 'miami' of github.com:GTAmodding/re3 into miami 2020-12-21 20:49:03 +01:00
aap
40b90618ef Merge branch 'master' of github.com:GTAmodding/re3 2020-12-21 20:48:48 +01:00
aap
309a4613a4 option for PC controls 2020-12-21 20:48:40 +01:00
aap
88b0134e72 option for PC controls 2020-12-21 20:48:28 +01:00
shfil
c0260b4167
Fix char encoding 2020-12-21 14:53:45 +01:00
shfil
752fc0381a
Fix character encoding 2020-12-21 14:51:47 +01:00
aap
1d7bdce0ef fix sizeof 2020-12-21 13:33:54 +01:00
aap
b574996334 fix sizeof 2020-12-21 13:33:35 +01:00
aap
e696d770be botched last commit 2020-12-21 12:38:02 +01:00
aap
fb97335d9f push/pop memids 2020-12-21 12:34:29 +01:00
aap
43b4c8dd33 some more little ps2 fixes 2020-12-20 19:13:58 +01:00
aap
f60b450ee8 main.cpp mostly checked against ps2 now 2020-12-20 19:13:37 +01:00
aap
84a9ca0524 Merge branch 'master' of github.com:GTAmodding/re3 2020-12-20 17:35:59 +01:00
aap
036263993e ps2 fixes 2020-12-20 17:35:46 +01:00
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
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
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
aap
2a51e1da04 Merge branch 'miami' of github.com:GTAmodding/re3 into miami 2020-12-19 17:27:01 +01: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
8d1996833b merge attempt 2020-12-19 03:21:04 +03:00
aap
9982f1f21b anim compression 2020-12-18 23:46:51 +01:00
aap
c17ccc50ab get rid of all PED_SKIN defines 2020-12-18 17:27:18 +01:00