a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-11-18 06:17:45 +00:00
Code Issues Projects Releases Wiki Activity
4321 commits 4 branches 2 tags 50 MiB
Commit graph

764 commits

Author SHA1 Message Date
Sergeanur e79e8b30e0 Partial hud 2021-01-24 17:21:50 +02:00
Sergeanur 13507d422b Add PSP scaling macros 2021-01-23 18:56:27 +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
Sergeanur 904090cbb6 Merge remote-tracking branch 'origin/miami' into lcs 
# Conflicts:
#	src/modelinfo/BaseModelInfo.cpp
 2021-01-23 15:14:15 +02: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
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 8dab92d158 CMessages::GetTokenPadKeyString 2021-01-22 05:49:17 +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
Fire-Head 37b9ba5bd7 lcs pobj 2021-01-22 02:59:08 +03:00
Sergeanur 9d2509ab5b A bit of frontend and GXT 2021-01-22 01:56:47 +02:00
withmorten d1317f8fa6 m_nWantedLevel -> GetWantedLevel() 2021-01-22 00:20:51 +01:00
Sergeanur e8db0e3abb Merge branch 'lcs' into lcsfont 
* lcs:
  fix
  enable screenshots for librw; update librw
  Get rid of bitfields in CPool
  Sync matrix with master
  free cam inversion fix
  free cam inversion fix
  Fix CFont::PrintStringFromBottom
  pc radar fix
  work on colourfilters
  PSP rendering and shader cleanup
  fix handbrake
  fix
  wrong ifdef
  fix
  some free cam fixes for controller
  sync milessdk with re3mss
  vehicle fixes
  fix
  add the bad crack "features" behind SECUROM define

# Conflicts:
#	src/render/Font.cpp
 2021-01-21 23:11:36 +02:00
Nikolay Korolev 23831e38e6 sync 2021-01-20 21:14:12 +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 3b52b683e3 Sync matrix with master 2021-01-20 19:20:11 +02:00
Sergeanur 95448eea3d More fonts 2021-01-20 18:40:54 +02:00
Sergeanur 9b820cc0b6 Fix CFont::PrintStringFromBottom 2021-01-20 14:23:03 +02:00
aap 2c1c5debca pc radar fix 2021-01-19 21:35:25 +01:00
Sergeanur f38ff074c4 more font 2021-01-19 03:24:02 +02:00
Sergeanur 8d2aa61f9b Merge branch 'lcs' into lcsfont 
# Conflicts:
#	src/render/Font.cpp
 2021-01-18 15:01:17 +02:00
Sergeanur 8395704dc6 Use of sized bool types for CFont 2021-01-18 14:55:48 +02: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
Fire-Head 777ef6b663 fix ida's sweet little lies 2021-01-17 06:16:49 +03:00
Fire-Head f5164f3804 fix crash on exit 2021-01-17 03:13:21 +03:00
Fire_Head 6075bf3fc2
Merge pull request #959 from Fire-Head/lcs 
Lcs Particle
 2021-01-16 22:00:02 +03:00
Sergeanur eb5fdac918 Merge branch 'miami' into lcs 
# Conflicts:
#	src/control/Script.h
 2021-01-16 16:56:24 +02:00
Sergeanur 518bc555a6 font 2021-01-16 16:55:26 +02:00
Sergeanur 21a6ed247b Use of sized bool types for CFont 2021-01-16 16:06:11 +02:00
Fire-Head 96fdbac69a rem null checks 2021-01-16 01:12:27 +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
erorcun 13b52229be hud ammo fix 2021-01-13 23:07:12 +03:00
Fire-Head d63e3f1559 Merge branch 'lcs' of https://github.com/GTAmodding/re3 into lcs 2021-01-13 20:18:26 +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 1b55a9956f some loose ends 2021-01-13 12:31:33 +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
Fire-Head ec17355056 Merge branch 'lcs' of https://github.com/GTAmodding/re3 into lcs 2021-01-13 02:55:47 +03:00
withmorten 2b91af4493
Merge pull request #955 from withmorten/miami 
move stuff back into class; securom comments
 2021-01-13 00:22:51 +01:00
withmorten 232d990e6d move stuff back into class; securom comments 2021-01-13 00:18:58 +01:00
Sergeanur 92b1e8ab75 More font fixes 2021-01-13 01:01:04 +02:00
aap d68d1d9999 escalator fix 2021-01-12 23:29:53 +01:00
aap faab9f4aa4 escalator fix 2021-01-12 23:28:13 +01:00
Fire-Head 660d040531 assert, temp fixes 2021-01-13 01:06:22 +03:00
Fire-Head 3e6016dc6e Merge branch 'lcs' of https://github.com/GTAmodding/re3 into lcs 2021-01-13 00:11:15 +03:00