a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-12-25 01:30:08 +00:00
Code Issues Projects Releases Wiki Activity
3287 commits 4 branches 2 tags 50 MiB
Commit graph

147 commits

Author SHA1 Message Date
Sergeanur f882586eb8 Merge remote-tracking branch 'origin/master' into miami 
# Conflicts:
#	README.md
#	src/core/Frontend.cpp
#	src/core/Frontend.h
#	src/peds/Ped.cpp
#	src/peds/Ped.h
#	src/render/Renderer.cpp
#	src/vehicles/Plane.cpp
 2020-07-22 18:29:17 +03:00
eray orçunus f40f44b14e Peds, Hud, CFO 1/2, fixes - including zone names 2020-07-22 15:19:22 +03:00
Sergeanur 7d51995640 Remove hacky way of injecting PS2 matfx on RW 3.3, remove static patcher 2020-07-22 03:32:46 +03:00
eray orçunus 70df13f9d3 Fixes from miami 2020-07-20 22:47:41 +03:00
Sergeanur 30384bb4ef Merge branch 'master' into miami 
# Conflicts:
#	src/render/Credits.cpp
 2020-07-17 21:15:47 +03:00
Sergeanur e8ded77e27 Add fix/workaround for black screen at startup 2020-07-17 21:14:48 +03:00
Sergeanur d0f5464200 Merge branch 'master' into miami 
# Conflicts:
#	src/control/CarAI.cpp
#	src/control/Phones.cpp
#	src/control/Phones.h
#	src/control/Record.cpp
#	src/control/Restart.cpp
#	src/control/Script.cpp
#	src/core/Collision.cpp
#	src/core/Frontend.cpp
#	src/core/Frontend.h
#	src/core/Game.h
#	src/core/Streaming.cpp
#	src/core/TempColModels.cpp
#	src/core/Wanted.cpp
#	src/core/Zones.cpp
#	src/core/config.h
#	src/core/main.cpp
#	src/core/re3.cpp
#	src/entities/Entity.cpp
#	src/entities/Physical.cpp
#	src/extras/frontendoption.cpp
#	src/modelinfo/ModelInfo.cpp
#	src/modelinfo/PedModelInfo.cpp
#	src/peds/CivilianPed.cpp
#	src/peds/CopPed.cpp
#	src/peds/EmergencyPed.cpp
#	src/peds/Ped.cpp
#	src/peds/Ped.h
#	src/peds/Population.cpp
#	src/render/Renderer.cpp
#	src/save/GenericGameStorage.cpp
#	src/skel/win/win.cpp
#	src/vehicles/Automobile.cpp
#	src/vehicles/Boat.cpp
#	src/vehicles/Boat.h
#	src/vehicles/Vehicle.cpp
 2020-07-13 18:10:17 +03:00
eray orçunus 70fa4ab79c Frontend: Stats, Briefs, gta_vc.set, slider ranges, fixes 2020-07-06 16:38:00 +03:00
eray orçunus 1cea84d2b1 Remove console and fix sth 2020-07-04 16:01:07 +03:00
eray orçunus ed036df3ce Re-enable console for debugging frontend 2020-07-03 05:40:22 +03:00
Filip Gawin 6cf698badd Fix glfw.cpp 2020-06-29 16:24:40 +02:00
Sergeanur b26eec5daf Merge remote-tracking branch 'origin/master' into miami 
# Conflicts:
#	src/audio/AudioLogic.cpp
#	src/audio/soundlist.h
#	src/control/Script.cpp
#	src/control/ScriptCommands.h
#	src/core/Cam.cpp
#	src/core/Camera.cpp
#	src/core/Camera.h
#	src/core/Frontend.cpp
#	src/core/Frontend.h
#	src/core/Game.cpp
#	src/core/MenuScreens.cpp
#	src/core/Pad.cpp
#	src/core/Pad.h
#	src/core/config.h
#	src/entities/Entity.cpp
#	src/render/Credits.cpp
#	src/render/Fluff.cpp
#	src/render/Hud.cpp
#	src/render/MBlur.cpp
#	src/render/Timecycle.cpp
#	src/skel/glfw/glfw.cpp
#	src/skel/win/win.cpp
#	src/text/Text.cpp
 2020-06-29 12:56:50 +03:00
Fire-Head d9cb9583bf update glfw.cpp 2020-06-29 11:04:30 +03:00
Fire-Head 63fdcf7e64 menu fixes 2020-06-29 10:29:02 +03:00
Fire_Head 860f75d66c
Merge branch 'master' into ps2menu 2020-06-29 09:37:53 +03:00
Fire-Head 1c11a8081f mips overdose 2020-06-28 00:01:51 +03:00
Sergeanur 509ca11d76 Merge remote-tracking branch 'origin/master' into miami 
# Conflicts:
#	src/control/GameLogic.cpp
#	src/control/PathFind.cpp
#	src/control/RoadBlocks.cpp
#	src/control/Script.cpp
#	src/control/Script.h
#	src/core/Frontend.cpp
#	src/core/Frontend.h
#	src/core/MenuScreens.cpp
#	src/core/TempColModels.cpp
#	src/core/config.h
#	src/core/re3.cpp
#	src/modelinfo/SimpleModelInfo.cpp
#	src/modelinfo/VehicleModelInfo.cpp
#	src/modelinfo/VehicleModelInfo.h
#	src/render/Skidmarks.h
#	src/render/WaterLevel.cpp
#	src/save/GenericGameStorage.h
#	src/vehicles/Automobile.cpp
#	src/vehicles/Automobile.h
#	src/vehicles/DamageManager.cpp
#	src/vehicles/Vehicle.cpp
#	src/vehicles/Vehicle.h
 2020-06-03 01:24:08 +03:00
eray orçunus 329a387fdf Frontend customization functions, freecam toggle, minor things 2020-05-28 11:34:12 +03:00
Sergeanur 88b6168f1c Merge branch 'master' into miami 
# Conflicts:
#	premake5.lua
#	src/control/Script.cpp
#	src/core/SurfaceTable.cpp
#	src/core/config.h
#	src/entities/Physical.cpp
#	src/entities/Physical.h
#	src/objects/Object.h
#	src/skel/skeleton.h
#	src/vehicles/Vehicle.h
 2020-05-23 21:14:16 +03:00
aap 9313bfa155 skeleton typos 2020-05-23 11:34:48 +02:00
aap e2d3ef449c skeleton typos 2020-05-23 11:34:40 +02:00
erorcun 8b82e9c40f
Merge pull request #574 from Xinerki/miami 
many additions
 2020-05-22 15:49:37 +03:00
eray orçunus a5f23a0342 VC CMenuManager struct, ctor etc. 2020-05-22 03:48:12 +03:00
Xinerki 900d5a4ce0 focus loss improvement 
for u aap
 2020-05-21 21:48:39 +03:00
Xinerki 1cb7b9876f scuffed InitAfterFocusLoss implementation 2020-05-21 14:23:12 +03:00
aap 9dc5dca209 remove some unneeded plane paths for the moment; also different exe icon 2020-05-16 11:34:51 +02:00
Sergeanur 24875f34d0 Merge branch 'master' into miami 
# Conflicts:
#	src/modelinfo/ClumpModelInfo.cpp
 2020-05-14 17:05:42 +03:00
aap f5345f59ea blacklist for glfw "joysticks" 2020-05-14 00:09:45 +02:00
Sergeanur 7c2b9478d5 Merge branch 'master' into miami 
# Conflicts:
#	src/control/Garages.cpp
#	src/core/FileLoader.cpp
#	src/core/Streaming.cpp
#	src/core/Zones.cpp
#	src/core/Zones.h
#	src/render/Renderer.cpp
#	src/rw/VisibilityPlugins.cpp
 2020-05-13 00:55:52 +03:00
Sergeanur 33dfaf7da1 Merge remote-tracking branch 'origin/master' into miami 
# Conflicts:
#	premake5.lua
#	src/core/ZoneCull.cpp
#	src/core/Zones.cpp
#	src/objects/CutsceneHead.cpp
#	src/render/Clouds.cpp
 2020-05-13 00:27:15 +03:00
Filip Gawin c2ac6b3759 Fix linux warnings 2020-05-12 23:18:54 +02:00
eray orçunus 36e2bc95d3 Fix Windows build and premake 2020-05-11 20:10:01 +03:00
eray orçunus 8a4fa58cd4 Linux build support 2020-05-11 21:00:55 +03:00
eray orçunus b80c4bae6b Menu map fixes and resizable window on GLFW 2020-05-09 13:58:31 +03:00
eray orçunus f754da272f Menu map fixes and resizable window on GLFW 2020-05-09 13:43:08 +03:00
aap 2eee4c5176 most of animation system done; little stuff here and there 2020-05-08 15:59:57 +02:00
aap 05a1d64fbb VC vehicles just barely working now 2020-05-07 11:33:20 +02:00
aap edd9301d7f reverting fuckup 2020-05-06 09:59:04 +02:00
aap bb0541404d updated librw 2020-05-06 09:24:12 +02:00
eray orçunus 97b288c1e4 Screen mode selector and persistent map target fix 2020-05-01 21:16:02 +03:00
aap 1b40693f80 improved video modes for glfw 2020-04-30 15:38:25 +02:00
aap 804b022e67 implemented improved video modes for win.cpp 2020-04-29 18:24:25 +02:00
aap c7e2845602 removed cpuid stuff from glfw as they caused a crash by clobbering registers. what to do about win.cpp? 2020-04-28 10:56:30 +02:00
Nikolay Korolev 68bf239868
Merge pull request #489 from Nick007J/master 
1.1 patch stuff + flying controls
 2020-04-27 00:53:54 +03:00
aap 41586c7cda fixes for glfw 2020-04-26 20:16:31 +02:00
Sergeanur b7ee3792df Remove struct workaround in CControllerConfigManager 2020-04-26 20:11:19 +03:00
eray orçunus 6c1a1f7cd2 Initial GLFW support 2020-04-26 13:29:50 +03:00
Nikolay Korolev 34ef766c67 Merge remote-tracking branch 'upstream/master' 2020-04-25 12:15:29 +03:00
aap f03b4eec4c implemented skinned peds, no cutscene hands yet 2020-04-24 11:42:38 +02:00
Nikolay Korolev 0b12cacf15 more 1.1 patch 2020-04-24 01:01:41 +03:00
eray orçunus c80403a2e0 Crossplatform work continues 2020-04-22 05:24:02 +03:00
Sergeanur 599164006a Remove patches 2020-04-17 16:31:11 +03:00
Fire-Head a4922d5cb7 rem refs 2020-04-17 08:54:14 +03:00
Sergeanur d455cd8a62 Default native resolution mode and small camera fixes 2020-04-16 00:46:09 +03:00
Fire-Head 3769170113 (PS2) TheGame/main/GameInit/SystemInit, ProcessSlowMode 2020-04-09 02:52:38 +03:00
eray orçunus a3b519ea64 CShotInfo, CWanted done, Frontend fix 2020-03-29 19:02:26 +03:00
eray orçunus 39c9a05827 Limit frontend FPS to 100 2020-03-28 23:28:36 +03:00
Fire-Head 3366cd0ff8 WaterCannon done, resource ico 2020-03-28 17:02:44 +03:00
Filip Gawin 8f01eab5ab Fixes for Serge's review 2020-03-22 17:30:54 +01:00
Sergeanur a3e5ccde47 cMusicManager 2020-02-07 02:30:00 +02:00
Sergeanur c202fc3b55 Implemented faststrcmp, faststricmp, strcasecmp 2019-10-30 01:35:31 +02:00
Sergeanur d84033a710 Small CPad fixes 2019-10-29 17:21:02 +02:00
Fire_Head 6a46cc6c3b
Merge branch 'master' into master 2019-10-27 06:36:58 +03:00
Fire-Head 537aaca5c2 ControllerConfig done 
Fix Cam enum
 2019-10-27 06:17:30 +03:00
Sergeanur d5a72fa597 Audio stuff moved around, removed MusicManager dependencies, eMusicMode used for ChangeMusicMode 2019-10-26 15:20:12 +03:00
Filip Gawin 2fabbc3b4c More more more audio 2019-08-27 21:18:47 +02:00
eray orçunus 5bea16c7cc AnimViewer! 2019-08-15 17:51:39 +03:00
Fire-Head 73e2a4b035 Merge branch 'master' of github.com:Fire-Head/re3 2019-08-02 23:23:05 +03:00
Fire-Head 6ba2b05443 sampman done 2019-08-02 23:20:12 +03:00
aap 60364f11da fixed dinput 2019-07-25 12:38:25 +02:00
aap 2d986b79d2
Merge pull request #153 from ThirteenAG/master 
premake and appveyor update
 2019-07-20 15:31:09 +02:00
ThirteenAG a8dfcc25c7 premake and appveyor update 2019-07-20 16:13:16 +03:00
aap 60045ec6cd couple of fixes 2019-07-20 14:39:38 +02:00
aap 90e093cd47 and of course the last commit didnt fix everything 2019-07-10 17:34:11 +02:00
aap 4a36d64f15 added wrappers around math functions 2019-07-10 17:18:26 +02:00
_AG 69b5c9f1e0 Update Frontend. 2019-07-03 17:30:26 +02:00
aap 25865e68c4 cleaned up to be closer to original game 2019-07-03 13:13:55 +02:00
aap e8215cf560
Revert "Implemented frontend inputs." 2019-07-02 22:05:11 +02:00
_AG 6c693e3bbf Implemented frontend inputs. 
Fixed #66 and few other stuff.
 2019-07-02 14:36:40 +02:00
Filip Gawin 2115faec38 Cleanup project a bit 2019-06-30 12:56:50 +02:00
aap 48cf8b6629 misc stuff, mostly collision 2019-06-28 19:23:28 +02:00
_AG e765dfe90a Initial commit for Frontend. 
Bug fixes:
fix #40, fix #39, fix #38, fix #37, fix #21.
Code organization and cleanup...
 2019-06-25 02:36:26 +02:00
aap b5fba778c4 first part of CFileLoader 2019-06-17 22:40:15 +02:00
aap 0add48abf5 got rid of upper case types 2019-06-17 00:23:19 +02:00
Fire_Head 9689def6a5
Merge branch 'master' into master 2019-06-13 03:47:13 +03:00
Fire-Head 75bca8e31e CPad done 2019-06-13 03:35:26 +03:00
aap 3472a614ae fixed CFileMgr somewhat; still issues when loading saves 2019-06-13 01:12:37 +02:00
Fire-Head 87655bc1cf tmp 2019-06-11 12:30:53 +03:00
Fire-Head e952d3e624 VK_LEFT fix 2019-06-05 23:25:13 +03:00
Fire-Head 4fc80e7b73 win.cpp/skeleton.cpp done 2019-06-05 22:28:54 +03:00
Fire-Head 2a6349e200 input done, fixed cheats input 2019-06-05 22:18:06 +03:00
Fire-Head 0c495cb188 added NO_MOVIES 2019-06-03 01:25:46 +03:00
Fire-Head 31f349d9c2 gamestates fixed, mpeg now working 2019-06-03 00:42:51 +03:00
Fire-Head caa61ad10b mouse fixed 2019-06-02 16:33:37 +03:00
aap cb12ee03ca fixed merge 2019-06-02 10:31:40 +02:00
Fire-Head b1f9e28cd1 skeleton updated, windows specific stuff added 2019-06-02 06:00:38 +03:00
Fire-Head 28fce310d5 rw skeleton 2019-05-31 20:02:26 +03:00