mirror/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2025-01-19 03:16:35 +00:00
Code Issues Projects Releases Wiki Activity
4742 commits 3 branches 0 tags 63 MiB
Commit graph

1688 commits

Author SHA1 Message Date
aap
9125e604b9 fix generic.txd crash 2021-02-05 10:58:01 +01:00
withmorten
a78212ea80 fix MASTER crashes 2021-02-04 23:43:04 +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
erorcun
713562685a OAL Loops, fixes 2021-02-02 22:30:13 +03: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
shfil
bb47f3a8e4
fix realloc 2021-01-31 15:02:15 +01:00
shfil
264d7d98d7
fix realloc 2021-01-31 15:01:46 +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
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
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
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
erorcun
e1e4be9017 Use previous naming & fix LineOfSightSectorList too 2021-01-28 03:57:12 +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
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
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
Nikolay Korolev
4abebbe3b2 use ARRAY_SIZE 2021-01-23 23:12:25 +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
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
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
aap
e99589a3eb fixed anisotropic filtering; updated librw 2021-01-21 22:17:35 +01: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
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
7e136a792f work on colourfilters 2021-01-19 20:42:16 +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
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
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
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
1b55a9956f some loose ends 2021-01-13 12:31:33 +01: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
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