crt0mega/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2021-09-07 08:09:38 +00:00
Code Issues Projects Releases Wiki Activity
5,576 Commits 3 Branches 0 Tags 79 MiB
9187873396
Commit Graph

1974 Commits

Author SHA1 Message Date
Steve Wills
20d9498fdb Put fix behind ifdef 2021-02-16 10:55:11 -05:00
Adrian Graber
ee287f6120 Only include sys/syscall.h when __linux__ is defined 2021-02-16 18:29:55 +03:00
Adrian Graber
48227bd350 Add unnamed semaphore define toggle for CdStreamPosix 2021-02-16 18:29:41 +03:00
erorcun
1a64053da5
Merge pull request #986 from AGraber/nx-upstream 
Add toggle for (un)named semaphores and prevent linux header inclusion on non-linux paltforms
 2021-02-16 18:27:31 +03:00
erorcun
4368841f02 Fix rare stream deadlock on Windows 2021-02-16 17:55:42 +03:00
erorcun
49fd99119d Fix rare stream deadlock on Windows 2021-02-16 17:45:29 +03:00
Steve Wills
a666de46aa Fix seg fault when configuring controller 
Since controllerAction can be -2 (line 2105)
 2021-02-14 14:06:37 -05:00
Sergeanur
02ac7c309e Disable RANDOMSPLASH only if loading screen is disabled 2021-02-13 16:16:02 +02:00
Sergeanur
4907c56231 Disable RANDOMSPLASH 2021-02-13 16:10:14 +02:00
aap
65f9917b65 clean up debug menu 2021-02-13 14:22:34 +01:00
aap
9c7d83ebc1 dbg menu again 2021-02-13 14:22:11 +01:00
aap
d0fbba19d1 debugmenu cleanup 2021-02-13 13:47:03 +01:00
aap
0f8614221b debugmenu cleanup 2021-02-13 00:00:02 +01:00
erorcun
035f0010d8 fix 2021-02-12 21:26:03 +03:00
erorcun
0ec16a5b0e Fix XInput hotplug 2021-02-12 21:10:52 +03:00
Filip Gawin
0c60ceeb33 Cmake version for hash 2021-02-12 21:09:46 +03:00
erorcun
2c784d979a Remove version text, add toggleable debug info(with commit hash!) 2021-02-12 21:09:23 +03:00
erorcun
6689b0be02 Fix XInput hotplug 2021-02-12 19:50:26 +03:00
Sergeanur
e98164ec41 Sync aspect ratio setting with master 2021-02-12 18:00:20 +02:00
erorcun
a44d7d86cb
Merge pull request #1029 from erorcun/master 
Remove version text, add toggleable debug info(with commit hash!)
 2021-02-12 18:15:51 +03:00
Filip Gawin
1b8d03f3aa Cmake version for hash 2021-02-12 16:38:03 +03:00
Sergeanur
c5042dcdf6 Add english strings to translations as stubs, also translation notice 2021-02-12 08:14:10 +02:00
Sergeanur
9e22eaf798 Fix RW34 2021-02-12 08:06:34 +02:00
Sergeanur
e7a4a3516f Add english strings to translations as stubs, also translation notice 2021-02-12 07:52:21 +02:00
Sergeanur
2c194df591 Fix RW33 2021-02-12 05:37:30 +02:00
erorcun
9e1c048e20 Remove version text, add toggleable debug info(with commit hash!) 2021-02-12 05:28:08 +03:00
aap
879838c9f2 enable screenshots with F12 2021-02-12 00:29:09 +01:00
aap
f3bfdd7857 imrove readme; enable screenshots with F12 2021-02-12 00:06:54 +01:00
Sergeanur
e4320c02cf Enable BIND_VEHICLE_FIREWEAPON 2021-02-11 17:16:01 +02:00
Sergeanur
c9f804486d Fix setup 4 texts 2021-02-11 06:53:00 +02:00
Sergeanur
4f27a28762 More fixes 2021-02-11 05:03:41 +02:00
Sergeanur
9f3f0ee2d2 Fix borders 2021-02-11 04:36:00 +02:00
Nikolay Korolev
3b0c958600 Merge remote-tracking branch 'upstream/lcs' into lcs 2021-02-10 21:03:20 +03:00
aap
8fb3a3ff23 fix typo 2021-02-10 15:10:27 +01:00
Sergeanur
3c7a7bc8a7 Fixes 2021-02-10 13:42:59 +02:00
Sergeanur
5f3e68ec45 Save vibration setting 2021-02-10 09:16:04 +02:00
Sergeanur
d6068c421d Add undef 2021-02-10 09:08:02 +02:00
Sergeanur
b6af7393e8 Merge remote-tracking branch 'origin/miami' into VC/ControllerMenu 
* origin/miami:
  fix clouds
  Use our synonyms for attack anims again
  Detect joystick menu for XInput
  reorganize shaders; use modulate flag; update librw
  fix generic.txd crash
  Use original animation names from VCS

# Conflicts:
#	src/core/MenuScreensCustom.cpp
 2021-02-10 09:01:53 +02:00
Sergeanur
12330e38cb Controller menu 2021-02-10 08:57:51 +02:00
aap
26bbbe0037 fix clouds 2021-02-09 20:02:29 +01:00
aap
031df36935 CColModel 2021-02-09 17:45:02 +01:00
erorcun
d460c3863e Also check font textures for new languages 2021-02-08 18:21:00 +03:00
erorcun
94eed33940 Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2021-02-08 13:24:49 +03:00
erorcun
b464bb7fd4 Merge branch 'miami' of https://github.com/GTAmodding/re3 into VCSanim 2021-02-08 13:23:19 +03:00
erorcun
0eb1913713 Merge branch 'master' of https://github.com/GTAmodding/re3 2021-02-08 13:21:53 +03:00
Nikolay Korolev
9b9ffc4b13 ferries 2021-02-07 23:29:49 +03:00
erorcun
d224f8b7ee Don't show menu map and new languages if gamefiles isn't copied 2021-02-07 20:38:53 +03:00
erorcun
675aef29cf Detect joystick menu for XInput 2021-02-07 19:50:17 +03:00
aap
cc435ea711 Merge branch 'miami' of github.com:GTAmodding/re3 into miami 2021-02-06 10:23:28 +01:00
erorcun
c7ba01b034 Detect joystick menu for XInput 2021-02-05 18:23:50 +03:00
withmorten
2bd8be5872 Fix inverted vertical camera 2021-02-05 12:08:14 +01:00
aap
9125e604b9 fix generic.txd crash 2021-02-05 10:58:01 +01:00
aap
5385d004ec fix generic.txd crash 2021-02-05 10:51:12 +01:00
withmorten
a78212ea80 fix MASTER crashes 2021-02-04 23:43:04 +01:00
withmorten
bf299e5c17 fix MASTER crashes 2021-02-04 23:41:10 +01:00
withmorten
8553120fdb add missing ASCII_STRCMP stuff 2021-02-04 19:47:47 +01:00
Sergeanur
4f7793a423
Merge pull request #997 from Fire-Head/lcs 
Lcs WaterCannon
 2021-02-03 21:44:21 +02:00
Sergeanur
91c3bdfa15
Merge pull request #1019 from Sergeanur/ControllerMenu2 
Controller menu
 2021-02-03 21:43:25 +02:00
Sergeanur
a7e11d134f Add undef 2021-02-03 02:53:54 +02:00
Sergeanur
91612eb45a Controller menu 2021-02-03 02:41:12 +02:00
Sergeanur
b47a23ab79
Merge pull request #1001 from Sergeanur/animNames 
Use original animation names from VCS
 2021-02-03 02:14:48 +02:00
erorcun
713562685a OAL Loops, fixes 2021-02-02 22:30:13 +03:00
withmorten
b65f8a3fe2 no advanced script log when log level is 0 2021-02-02 11:35:16 +01:00
withmorten
1b293a3cfb no advanced script log when log level is 0 2021-02-02 11:32:20 +01:00
erorcun
1eb77c4d6d
Merge pull request #1016 from erorcun/miami 
Overhaul MusicManager - fix radio bugs, scroll to prev station, radio…
 2021-02-02 05:31:29 +03:00
erorcun
902e539c0d Overhaul MusicManager - fix radio bugs, scroll to prev station, radio off text 2021-02-01 14:18:17 +03:00
Filip Gawin
3d4791f291 Revert "First batch of fixes (CallAndMessage)" 
This reverts commit 7a3b80a9b7.
 2021-01-31 21:06:38 +01:00
Filip Gawin
7a3b80a9b7 First batch of fixes (CallAndMessage) 2021-01-31 20:44:39 +01:00
shfil
bb47f3a8e4
fix realloc 2021-01-31 15:02:15 +01:00
shfil
264d7d98d7
fix realloc 2021-01-31 15:01:46 +01:00
shfil
5de4e88d7a
fix realloc 2021-01-31 15:00:36 +01:00
Adrian Graber
b60baf46f6 Only include sys/syscall.h when __linux__ is defined 2021-01-31 14:27:06 +01:00
Adrian Graber
d76b58cc72 Add unnamed semaphore define toggle for CdStreamPosix 2021-01-31 14:27:00 +01:00
Nikolay Korolev
a0c5d75f83 fixed bike bomb 2021-01-30 14:55:00 +03:00
Nikolay Korolev
dbf5c06144 fixed bike bomb 2021-01-30 14:53:51 +03:00
erorcun
f61a91c97d Merge branch 'master' of https://github.com/GTAmodding/re3 2021-01-29 19:30:27 +03:00
erorcun
d52b917c54 Some regular fixes and UB fixes 2021-01-29 19:23:02 +03:00
erorcun
f5f153dbfd Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2021-01-29 19:16:40 +03:00
erorcun
c4328afce7 Even more fixes & shorten quit screen 2021-01-29 19:16:26 +03:00
withmorten
f7fc919d98 add NewRenderer ini read/write 2021-01-29 16:46:03 +01:00
withmorten
7db28f9f7f fix NewRender typo 2021-01-29 16:43:17 +01:00
withmorten
934aa92a9b add NewRenderer ini read/write, fix backfaceculling read 2021-01-29 16:41:34 +01:00
erorcun
2e7405b76c CdStreamPosix fixes 2021-01-29 16:31:13 +03:00
erorcun
982b024c5c CdStreamPosix fixes 2021-01-29 16:25:32 +03:00
aap
595a000f6a fix shutdown 2021-01-29 13:43:50 +01:00
erorcun
810bad9fd8 Fix some UBs 2021-01-29 01:44:33 +03:00
aap
64a4ed6db6 fixed uninitialized nearclip 2021-01-28 17:40:15 +01:00
erorcun
e1e4be9017 Use previous naming & fix LineOfSightSectorList too 2021-01-28 03:57:12 +03:00
erorcun
2d0562412e Use previous naming & fix LineOfSightSectorList too 2021-01-28 03:49:50 +03:00
erorcun
2b269ff1c0 Fix some Collision NaN/inf's 2021-01-28 02:18:04 +03:00
erorcun
be88a42bad Fix some Collision NaN/inf's 2021-01-28 00:51:43 +03:00
erorcun
ab939e059b Clean up POSIX streaming code 2021-01-27 22:19:00 +03:00
Sergeanur
97351ad2c2 Use original animation names from VCS 2021-01-27 18:50:24 +02:00
erorcun
843dd9b5e1 Clean up POSIX streaming code 2021-01-27 18:26:08 +03:00
Sergeanur
0f623c2354 Use original animation names from VCS 2021-01-26 19:35:40 +02:00
Sergeanur
f27e1ec818 Fix doubles in ZoneCull 2021-01-26 19:26:28 +02:00
Fire_Head
0ae6d1fecf
Merge branch 'lcs' into lcs 2021-01-26 01:01:32 +03:00
Fire-Head
d898abf63d config 2021-01-26 00:55:55 +03:00
Sergeanur
9647901ba0 Merge branch 'miami' into lcs 
# Conflicts:
#	src/control/Script.h
#	src/modelinfo/SimpleModelInfo.cpp
#	src/modelinfo/VehicleModelInfo.cpp
#	src/rw/VisibilityPlugins.cpp
#	src/rw/VisibilityPlugins.h
 2021-01-25 19:35:03 +02:00
withmorten
9d4053419b
Merge pull request #977 from withmorten/miami-cw 
make building with Codewarrior 7 possible
 2021-01-25 14:06:53 +01:00
aap
785bd8ebcc proper ini fix 2021-01-25 13:02:00 +01:00
aap
4f591aa87a ini fixes 2021-01-25 10:30:57 +01:00
aap
d6544933aa
Merge pull request #984 from aap/lcs 
modelinfos
 2021-01-25 10:30:34 +01:00
aap
ce7f166ba3 CVehicleModelInfo 2021-01-24 22:50:16 +01:00
Sergeanur
0ad1426950 Merge remote-tracking branch 'origin/miami' into lcs 
# Conflicts:
#	src/control/Script.cpp
 2021-01-24 22:22:16 +02:00
erorcun
a0bf47cfd2 Fix out of bound binding orders 2021-01-24 19:39:31 +03:00
aap
a202e67349 CPedModelInfo and CTempColModels 2021-01-24 17:14:16 +01:00
withmorten
29fb996b00 make building with Codewarrior 7 possible 2021-01-24 17:08:34 +01:00
erorcun
b728f8de64 Fix out of bound binding orders 2021-01-24 19:08:07 +03:00
Sergeanur
e79e8b30e0 Partial hud 2021-01-24 17:21:50 +02:00
aap
9361aeb8eb CTimeModelInfo and CWeaponModelInfo 2021-01-24 14:06:16 +01:00
aap
8cbae5d62a CSimpleModelInfo 2021-01-24 13:47:33 +01:00
withmorten
5183d7cf0f enable default resolution for vanilla defines 2021-01-23 23:18:05 +01:00
Nikolay Korolev
4abebbe3b2 use ARRAY_SIZE 2021-01-23 23:12:25 +03:00
Nikolay Korolev
921ca7712e use ARRAY_SIZE 2021-01-23 23:10:59 +03:00
Sergeanur
2d00d9cbe6 More scaling macro 2021-01-23 22:06:17 +02:00
Nikolay Korolev
d28e9a7b62 Merge remote-tracking branch 'upstream/lcs' into lcs 2021-01-23 23:04:38 +03:00
Nikolay Korolev
37d1aa4129 script fixes 2021-01-23 23:04:24 +03:00
Sergeanur
13507d422b Add PSP scaling macros 2021-01-23 18:56:27 +02:00
Sergeanur
de44a17e64 Fix ini name 2021-01-23 18:16:47 +02:00
Sergeanur
e9689a0a07 Merge remote-tracking branch 'origin/miami' into lcs 
# Conflicts:
#	src/core/re3.cpp
 2021-01-23 17:54:46 +02:00
erorcun
1b32840424 No more resetting bindings for joypad, create .ini at the first start, joystick hotplug for Linux 2021-01-23 16:18:19 +03:00
Sergeanur
defbb01aaa Merge remote-tracking branch 'origin/lcs' into lcs 
* origin/lcs:
  Remove size assert
  Add TXD mid field
  Enable GTA_BRIDGE
  LCS model indices
 2021-01-23 15:14:24 +02: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
4bde3366c1
Merge pull request #980 from Sergeanur/lcsMID 
LCS model indices
 2021-01-23 15:09:54 +02:00
Sergeanur
cfac29b0ef Remove restrictions in CGame::Process 2021-01-23 15:09:34 +02:00
erorcun
45c2488e36 Migrate from old .ini to new .ini 2021-01-23 16:04:19 +03:00
erorcun
73f1340afb Store all settings in .INI 2021-01-23 15:59:38 +03:00
aap
20bcd4bd69 colstore done 2021-01-23 12:40:23 +01:00
withmorten
2650fa9a92 VANILLA_BUILD fixes 2021-01-23 02:17:28 +01:00
Sergeanur
b35b0c598d Enable GTA_BRIDGE 2021-01-23 03:09:15 +02:00
Sergeanur
6b54d04bfc LCS model indices 2021-01-23 02:56:48 +02:00
erorcun
f85b5e99ed Includes overhaul, fix some compiler warnings 2021-01-23 03:23:16 +03:00
withmorten
6f4e2ab491 get rid of unsupported LIBRW in config.h 2021-01-22 22:47:29 +01:00
erorcun
226e3b83da No more resetting bindings for joypad, create .ini at the first start, joystick hotplug for Linux 2021-01-22 23:43:49 +03:00
withmorten
f6c846d27a fix 2021-01-22 21:27:18 +01:00
withmorten
3b4e79f073 small fix regarding codewarrior and AUDIO_MSS 2021-01-22 21:10:49 +01:00
withmorten
d58f090198 fix RW33 build, undef ANISOTROPIC_FILTERING for vanilla build 2021-01-22 20:33:29 +01:00
Filip Gawin
e9adf8162b fix 2021-01-22 19:59:27 +01:00
Filip Gawin
609cad506f Better output for validating size assert 2021-01-22 19:54:43 +01:00
Nikolay Korolev
bdb216bf7c fix 2021-01-22 20:59:57 +03:00
Sergeanur
e019bd91fd Reenable PS2_AUDIO_PATHS 2021-01-22 19:46:50 +02:00
Sergeanur
ea916b6ae5 Merge remote-tracking branch 'origin/miami' into lcs 
* origin/miami:
  fix config.h
  small premake fix
 2021-01-22 19:45:58 +02:00
withmorten
cc6d5374d5 fix config.h 2021-01-22 18:41:58 +01: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
b5deee823c Load LCS radar blips 2021-01-22 04:00:17 +02:00
Sergeanur
7091ab5e75 Fix save/load and brief menus 2021-01-22 02:44:32 +02:00
Sergeanur
e6d9a0d1ad Get rid of outro screen 2021-01-22 02:19:02 +02:00
aap
c8236d0dd2
Merge pull request #976 from Fire-Head/lcs 
Lcs pobj
 2021-01-22 01:12:03 +01:00
aap
ce77e80414
Merge pull request #963 from Nick007J/lcs 
all LCS script commands
 2021-01-22 00:59:20 +01:00
aap
de10f0dda6
Merge pull request #975 from aap/lcs 
loadscreens, not accurate
 2021-01-22 00:59:13 +01:00
Fire-Head
37b9ba5bd7 lcs pobj 2021-01-22 02:59:08 +03:00
aap
035d655e47
Merge pull request #972 from Sergeanur/lcsfont 
Partial CFont
 2021-01-22 00:59:07 +01:00
Sergeanur
06d8860d42 Merge remote-tracking branch 'origin/miami' into lcs 
* origin/miami:
  fuck
  bletch
  fixed anisotropic filtering; updated librw
  fix
 2021-01-22 01:58:38 +02:00
Sergeanur
9d2509ab5b A bit of frontend and GXT 2021-01-22 01:56:47 +02:00
aap
f7ab5cb7c4 loadscreens, not accurate 2021-01-22 00:41:34 +01:00
withmorten
d1317f8fa6 m_nWantedLevel -> GetWantedLevel() 2021-01-22 00:20:51 +01:00
withmorten
497e0b801f m_nWantedLevel -> GetWantedLevel() 2021-01-22 00:19:44 +01:00
withmorten
a511d79bf0 free cam fixes 2021-01-21 23:21:03 +01:00
aap
69500eed56 how the hell did that happen? 2021-01-21 22:35:11 +01:00
aap
c67273e92a fixed anisotropic filtering; updated librw 2021-01-21 22:30:20 +01:00
aap
e99589a3eb fixed anisotropic filtering; updated librw 2021-01-21 22:17:35 +01:00
withmorten
034df61f3c codewarrior: finishing touches 2021-01-21 19:42:51 +01:00
withmorten
f2596b3759 Merge remote-tracking branch 'upstream/master' into cw 2021-01-21 03:20:31 +01:00
withmorten
ac0f759b27 make building with Codewarrior 7 possible 2021-01-21 03:18:15 +01:00
Nikolay Korolev
8e825fa629 fixed saving 2021-01-20 22:16:11 +03:00
Nikolay Korolev
a5be17d941 Merge branch 'lcs-dev' into lcs 2021-01-20 21:15:03 +03:00
Nikolay Korolev
23831e38e6 sync 2021-01-20 21:14:12 +03:00
Nikolay Korolev
ad745aae63 some more script 2021-01-20 21:12:42 +03: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
Sergeanur
c7c7eff918 Get rid of bitfields in CPool 
# Conflicts:
#	src/core/templates.h
 2021-01-20 19:24:08 +02:00
Sergeanur
3b52b683e3 Sync matrix with master 2021-01-20 19:20:11 +02:00
Sergeanur
c54f5c4b4f
Merge pull request #971 from Sergeanur/PoolFlags 
Get rid of bitfields in CPool
 2021-01-20 18:59:49 +02:00
Sergeanur
9b193a47a2
Merge pull request #966 from Sergeanur/matrix 
Get rid of RwMatrix in CMatrix
 2021-01-20 18:59:33 +02:00
withmorten
ba34d72183 free cam inversion fix 2021-01-20 13:59:17 +01:00
withmorten
8590457d41 free cam inversion fix 2021-01-20 13:57:03 +01:00
Nikolay Korolev
b4b4c996ba Merge branch 'lcs-dev' into lcs 2021-01-20 12:12:56 +03:00
Nikolay Korolev
b1454276ed Merge remote-tracking branch 'upstream/lcs' into lcs 2021-01-20 12:12:46 +03:00
Nikolay Korolev
aa0f77043c script fixes 2021-01-20 12:12:26 +03:00
aap
2c1c5debca pc radar fix 2021-01-19 21:35:25 +01:00
Nikolay Korolev
dac4dd560a saves 2021-01-19 23:34:37 +03:00
aap
505438cd90 Merge branch 'master' of github.com:GTAmodding/re3 2021-01-19 21:33:17 +01:00
aap
bb66028e74 pc radar fix 2021-01-19 21:33:09 +01:00
aap
7e136a792f work on colourfilters 2021-01-19 20:42:16 +01:00
Sergeanur
a9b8d30ce0 Get rid of bitfields in CPool 2021-01-19 21:32:55 +02:00
withmorten
25d3066eae fix RWLIBS build without GTA_PS2_STUFF 2021-01-19 12:05:38 +01:00
aap
8baae4c77f PSP rendering and shader cleanup 2021-01-19 11:38:51 +01:00
Nikolay Korolev
923abb94d8 Merge branch 'lcs-dev' into lcs 2021-01-19 00:03:52 +03:00
Nikolay Korolev
47c697feca fixes 2021-01-18 23:58:26 +03:00
Nikolay Korolev
177680216c fix 2021-01-18 22:30:18 +03:00
Nikolay Korolev
4f36a1fb77 sync 2021-01-18 22:20:44 +03:00
Nikolay Korolev
14a1d3d251 Merge branch 'lcs' into lcs-dev 2021-01-18 22:20:27 +03:00
Nikolay Korolev
239dd55146 Merge remote-tracking branch 'upstream/lcs' into lcs 2021-01-18 22:19:50 +03:00
Nikolay Korolev
c09297997e script full 2021-01-18 22:19:30 +03:00
withmorten
776693235c fix 2021-01-18 20:10:13 +01:00
withmorten
b5c09965a9 some free cam fixes for controller 2021-01-18 20:10:13 +01:00
Sergeanur
91093305d6 Get rid of RwMatrix in CMatrix 2021-01-18 21:06:59 +02:00
withmorten
20dabf0b49 fix 2021-01-18 17:30:18 +01:00
withmorten
df4e22e3d0 some free cam fixes for controller 2021-01-18 17:25:31 +01:00
withmorten
a6faa0384b fix common.h d3d includes 2021-01-17 22:10:04 +01:00
erorcun
deaaf3d22f Migrate from old .ini to new .ini 2021-01-17 21:33:53 +01:00
erorcun
448e41ecaa Store all settings in .INI 2021-01-17 21:33:53 +01:00
erorcun
5a47379bf5 Includes overhaul, fix some compiler warnings 2021-01-17 21:32:54 +01:00
aap
2b4b00b388
Merge pull request #960 from withmorten/miami 
add the bad crack "features" behind SECUROM define
 2021-01-17 20:06:25 +01:00
Nikolay Korolev
4703ec5164 sync 2021-01-17 16:03:37 +03:00
Nikolay Korolev
9001a64ef9 Merge branch 'lcs' into lcs-dev 2021-01-17 16:02:56 +03:00
Nikolay Korolev
e5af1edcb9 script until 1497 2021-01-17 16:02:19 +03:00
aap
913a001375 vehicle fixes 2021-01-17 10:00:41 +01:00
Nikolay Korolev
ef97134f50 sync 2021-01-16 18:17:42 +03:00
Sergeanur
caa7d3177c Use of sized bool types for CFont 2021-01-16 16:05:27 +02:00
Fire-Head
8989b5ea39 Merge branch 'lcs' of https://github.com/GTAmodding/re3 into lcs 2021-01-15 19:13:05 +03:00
Sergeanur
4bd7bafd7c Merge branch 'miami' into lcs 
# Conflicts:
#	.github/workflows/reLCS_msvc_amd64.yml
#	.github/workflows/reLCS_msvc_x86.yml
#	premake5.lua
#	src/control/Script2.cpp
#	src/control/Script8.cpp
 2021-01-15 17:57:35 +02:00
withmorten
d5ce8b1ea3 add the bad crack "features" behind SECUROM define 2021-01-14 23:16:42 +01:00
Filip Gawin
5acbf9ef59 fix 2021-01-14 22:20:40 +01:00
Filip Gawin
1082b13830 RE3_NO_AUTOLINK to CMAKE_NO_AUTOLINK 2021-01-14 22:15:36 +01:00
Filip Gawin
c7b905c0ec More checks before autolinking 2021-01-14 22:06:27 +01:00
aap
3a6935f126 fixed shoot through collision 2021-01-13 20:39:00 +01:00
Fire-Head
d63e3f1559 Merge branch 'lcs' of https://github.com/GTAmodding/re3 into lcs 2021-01-13 20:18:26 +03:00
Nikolay Korolev
7388cc8a78 Merge branch 'lcs' into lcs-dev 2021-01-13 19:47:00 +03:00
aap
361808923a arrest cam fixes 2021-01-13 14:16:38 +01:00
Nikolay Korolev
3e198086e3 some script 2021-01-13 16:01:49 +03:00
Sergeanur
ff057838ec Merge branch 'miami' into lcs 
* miami:
  Fix backface culling of cutscene objects
  more renames
  anim velocity union
  rename m_vehEnterType -> m_vehDoor
  Port cmake improvements to miami
  some loose ends
  move TODO to Readme
  Fix build without FIX_BUGS, divide to 0 fixes
 2021-01-13 14:56:25 +02:00
aap
e3a261d29c rename m_vehEnterType -> m_vehDoor 2021-01-13 13:01:20 +01:00
aap
7c3e43aa2e rename m_vehEnterType -> m_vehDoor 2021-01-13 13:01:11 +01:00
aap
1b55a9956f some loose ends 2021-01-13 12:31:33 +01:00
erorcun
57201187de Fix build without FIX_BUGS, divide to 0 fixes 2021-01-13 14:22:31 +03:00
erorcun
542a5393ac Fix build without FIX_BUGS, divide to 0 fixes 2021-01-13 03:08:50 +03: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
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
cc2cebffb6 update librw 2021-01-10 18:43:11 +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
822f0bd40b cam sector fix 2021-01-09 12:11:52 +01: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
Fire-Head
02f6ed7da3 fix last commit, debugmenu options 2021-01-08 23:55:13 +03:00
Sergeanur
de13141b68 CKeyGen fixes 2021-01-08 22:39:25 +02:00
Fire-Head
39a121351d Merge branch 'master' of https://github.com/GTAmodding/re3 2021-01-08 23:30:35 +03:00
Fire-Head
00d23c61d9 .ini for scaling, radar, sprites 2021-01-08 23:30:30 +03: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
8eed6ae179 Use original names 2021-01-08 21:50:59 +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
Fire_Head
6e42c791cf
Merge pull request #909 from Fire-Head/master 
Sprite Scaling Option
 2021-01-08 19:43:31 +03:00
Sergeanur
bf3135eb41 Enable trains 2021-01-08 18:31:50 +02:00
Fire-Head
368d2f3279 bb .ini hello defines 2021-01-08 19:31:48 +03: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
Nikolay
c594d89dc5
Merge pull request #930 from Nick007J/master 
PS2 combinations for our cheats
 2021-01-08 18:52:37 +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
223b49e3be little fixes 2021-01-08 13:51:50 +01: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