Commit graph

15 commits

Author SHA1 Message Date
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
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
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
aap
41586c7cda fixes for glfw 2020-04-26 20:16:31 +02:00
eray orçunus
6c1a1f7cd2 Initial GLFW support 2020-04-26 13:29:50 +03:00