Commit Graph

76 Commits

Author SHA1 Message Date
30384bb4ef Merge branch 'master' into miami
# Conflicts:
#	src/render/Credits.cpp
2020-07-17 21:15:47 +03:00
e8ded77e27 Add fix/workaround for black screen at startup 2020-07-17 21:14:48 +03:00
70fa4ab79c Frontend: Stats, Briefs, gta_vc.set, slider ranges, fixes 2020-07-06 16:38:00 +03:00
1cea84d2b1 Remove console and fix sth 2020-07-04 16:01:07 +03:00
ed036df3ce Re-enable console for debugging frontend 2020-07-03 05:40:22 +03:00
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
d9cb9583bf update glfw.cpp 2020-06-29 11:04:30 +03:00
63fdcf7e64 menu fixes 2020-06-29 10:29:02 +03:00
860f75d66c Merge branch 'master' into ps2menu 2020-06-29 09:37:53 +03:00
1c11a8081f mips overdose 2020-06-28 00:01:51 +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
8b82e9c40f Merge pull request #574 from Xinerki/miami
many additions
2020-05-22 15:49:37 +03:00
a5f23a0342 VC CMenuManager struct, ctor etc. 2020-05-22 03:48:12 +03:00
900d5a4ce0 focus loss improvement
for u aap
2020-05-21 21:48:39 +03:00
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
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
36e2bc95d3 Fix Windows build and premake 2020-05-11 20:10:01 +03:00
8a4fa58cd4 Linux build support 2020-05-11 21:00:55 +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
97b288c1e4 Screen mode selector and persistent map target fix 2020-05-01 21:16:02 +03:00
aap
804b022e67 implemented improved video modes for win.cpp 2020-04-29 18:24:25 +02:00
68bf239868 Merge pull request #489 from Nick007J/master
1.1 patch stuff + flying controls
2020-04-27 00:53:54 +03:00
b7ee3792df Remove struct workaround in CControllerConfigManager 2020-04-26 20:11:19 +03:00
6c1a1f7cd2 Initial GLFW support 2020-04-26 13:29:50 +03:00
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
0b12cacf15 more 1.1 patch 2020-04-24 01:01:41 +03:00
c80403a2e0 Crossplatform work continues 2020-04-22 05:24:02 +03:00
599164006a Remove patches 2020-04-17 16:31:11 +03:00
a4922d5cb7 rem refs 2020-04-17 08:54:14 +03:00
d455cd8a62 Default native resolution mode and small camera fixes 2020-04-16 00:46:09 +03:00
3769170113 (PS2) TheGame/main/GameInit/SystemInit, ProcessSlowMode 2020-04-09 02:52:38 +03:00
a3b519ea64 CShotInfo, CWanted done, Frontend fix 2020-03-29 19:02:26 +03:00
39c9a05827 Limit frontend FPS to 100 2020-03-28 23:28:36 +03:00
3366cd0ff8 WaterCannon done, resource ico 2020-03-28 17:02:44 +03:00
8f01eab5ab Fixes for Serge's review 2020-03-22 17:30:54 +01:00
a3e5ccde47 cMusicManager 2020-02-07 02:30:00 +02:00
c202fc3b55 Implemented faststrcmp, faststricmp, strcasecmp 2019-10-30 01:35:31 +02:00
d84033a710 Small CPad fixes 2019-10-29 17:21:02 +02:00
6a46cc6c3b Merge branch 'master' into master 2019-10-27 06:36:58 +03:00
537aaca5c2 ControllerConfig done
Fix Cam enum
2019-10-27 06:17:30 +03:00
d5a72fa597 Audio stuff moved around, removed MusicManager dependencies, eMusicMode used for ChangeMusicMode 2019-10-26 15:20:12 +03:00
2fabbc3b4c More more more audio 2019-08-27 21:18:47 +02:00
5bea16c7cc AnimViewer! 2019-08-15 17:51:39 +03:00
73e2a4b035 Merge branch 'master' of github.com:Fire-Head/re3 2019-08-02 23:23:05 +03:00