a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-12-23 05:40:00 +00:00
Code Issues Projects Releases Wiki Activity
4321 commits 4 branches 2 tags 50 MiB
Commit graph

4321 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nikolay Korolev e9d58b5a90 Merge branch 'lcs' into lcs-dev 2021-01-24 13:42:48 +03:00
Nikolay Korolev ee89c485fc sync 2021-01-24 13:42:45 +03:00
Nikolay Korolev 8cdc6b5d7c fix merge failure 2021-01-23 23:53:59 +03:00
Nikolay Korolev c4f0b4fb6d mission cleanup fix 2021-01-23 23:20:22 +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
aap a1d6833bac txd store 2021-01-23 19:23:38 +01: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 770456d0c8 Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2021-01-23 16:50:55 +03: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
Nikolay Korolev 3326603265 added some missing functions 2021-01-23 15:33:01 +03:00
Nikolay Korolev b5c4866964 added some missing functions 2021-01-23 15:32:07 +03:00
aap f6fb473cf9 revert accident 2021-01-23 12:59:52 +01:00
aap a22b6168c6 wrong path node array 2021-01-23 12:50:46 +01:00
aap 2814f2e8cf wrong path node array 2021-01-23 12:49:54 +01:00
aap 20bcd4bd69 colstore done 2021-01-23 12:40:23 +01:00
Nikolay Korolev 552497d71b fix 2021-01-23 14:11:57 +03:00
Nikolay Korolev 8d0100f100 Merge remote-tracking branch 'upstream/lcs' into lcs 2021-01-23 12:54:27 +03:00
Nikolay Korolev a105003a7a I hate GetATanOfXY 2021-01-23 12:54:08 +03:00
Sergeanur e03aaec030 Add (Don't) walk lights 2021-01-23 04:07:50 +02:00
Sergeanur 0aad73f4a1 Remove size assert 2021-01-23 03:39:24 +02:00
Sergeanur 3565f179af Add TXD mid field 2021-01-23 03:12:01 +02: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 10120eb12f
Merge pull request #979 from erorcun/miami 
Includes overhaul, fix some compiler warnings
 2021-01-23 03:34:15 +03:00
erorcun f85b5e99ed Includes overhaul, fix some compiler warnings 2021-01-23 03:23:16 +03:00
Nikolay Korolev 965a3d6eec Merge remote-tracking branch 'upstream/lcs' into lcs 2021-01-23 02:36:34 +03:00
Nikolay Korolev 917cf44def script coronas 2021-01-23 02:36:13 +03:00
Sergeanur c884edd923 cSmallHeap 2021-01-23 00:03:12 +02: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
withmorten ba0b06f268 small premake fix 2021-01-22 16:40:17 +01:00
withmorten 1d3e84b712
small premake fix 2021-01-22 16:39:28 +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
aap 4acc9b08a2
Merge pull request #974 from withmorten/miami-wantedlevel 
m_nWantedLevel -> GetWantedLevel()
 2021-01-22 10:33:55 +01:00
Sergeanur 8dab92d158 CMessages::GetTokenPadKeyString 2021-01-22 05:49:17 +02: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