Bradley Bell
17770f0cce
Added .travis.yml
2015-03-24 22:12:23 -07:00
Kp
06a1c74c18
Fix Windows OpenGL build
...
Fixes: 9d33fad4dd
("Implement different GL synchronization methods")
2015-03-25 01:59:21 +00:00
Kp
ff83ba95b6
Remove unused ogl_extensions_init return value
2015-03-25 01:59:21 +00:00
Kp
694c522756
Use array<> for OpenGL extension version
2015-03-25 01:59:20 +00:00
Christian
97fc714970
Merge pull request #53 from derhass/unification/syncgl
...
cleaned-up syncgl patch for unification
2015-03-24 12:37:55 +01:00
Kp
5d6e2c16c6
Fix kill accounting
...
Fixes: c4ae4e5379
("Pass player number to multi functions")
2015-03-24 02:35:37 +00:00
Kp
0707664ae1
Use enum for kmatrix_view result
2015-03-24 02:07:42 +00:00
derhass
daf6b7a29a
add missing line break in -gl_syncwait help message
2015-03-23 20:18:27 +01:00
derhass
639b569496
Merge branch 'unification/master' into unification/syncgl_v2
...
Conflicts:
similar/arch/ogl/gr.cpp
similar/misc/args.cpp
2015-03-23 20:18:17 +01:00
derhass
bf723efd48
use C++ style reinterpret_casts to pointers from SDL_GetProcAddress to function pointer types
2015-03-23 20:06:23 +01:00
zico
8d686ab23b
implemented return value for kmatrix_view() so we can properly bail out of the game loop in AdvanceLevel()
2015-03-23 03:03:22 +01:00
zico
8292efe622
made code for level progression more similar between D1X and D2X
2015-03-23 02:43:31 +01:00
Kp
1e5acb5f6e
Fix guided missile crash
...
Check type before checking signature. Objects with type OBJ_NONE are
not guaranteed to have any particular signature. Commit 91d31b1
removed
the statement which cleared the signature when the type changes to
OBJ_NONE.
Fixes: 91d31b1952
("Wrap object signature in subtype")
2015-03-22 22:48:47 +00:00
Kp
d63be36fb3
Fix bogus trap on remote_owner check
...
Some call sites pass a uint8_t to objnum_remote_to_local, which is
zero-extended up to an int. The check for owner==-1 then fails, causing
the sanity check to trap to the debugger, even though the situation is
normal and harmless. Switch the type to int8_t to ensure that the value
is not sign/zero-extended.
2015-03-22 22:48:47 +00:00
Kp
b4eaa591c8
Fix crash when all sound channels are in use
...
If digi_mixer_find_channel returns -1, do not use that result to index
channels[].
2015-03-22 22:48:47 +00:00
Kp
95eccebcb3
Fix parsing of MULTI_FIRE_TRACK/MULTI_FIRE_BOMB
...
Fixes: 04d84ae61d
("Pass shot orientation with each weapon packet")
2015-03-22 22:48:47 +00:00
derhass
6d41224638
move GL synchronization code into its own class
2015-03-22 21:19:06 +01:00
derhass
db267af6f2
add basic OpenGL extension handling
...
Currently only used for fence sync objects.
2015-03-22 20:32:14 +01:00
Kp
d04e7902ee
Make file_get*list static
2015-03-22 18:49:21 +00:00
Kp
383e7703b6
Use ntstring in file_getdirlist
2015-03-22 18:49:21 +00:00
Kp
677e48bc7e
Warn when aspect ratio is ignored
2015-03-22 18:49:21 +00:00
Kp
627547371f
Improve change_res error checking
2015-03-22 18:49:21 +00:00
Kp
2b44a352ca
Remove redundant sc_mode
...
sc_mode is a packed copy of sc_w/sc_h. Switch to an accessor that uses
the copy.
2015-03-22 18:49:21 +00:00
Kp
fca381727c
Add wrappers for screen width/height
2015-03-22 18:49:21 +00:00
Kp
8daa014d53
Remove unused gr_check_mode
2015-03-22 18:49:21 +00:00
Kp
6c861b61cd
Move RPI variables to usage site
2015-03-22 18:49:21 +00:00
Kp
f098471e54
Make sdl_video_flags static
2015-03-22 18:49:21 +00:00
Kp
4afeba001a
Move gl_* variables to local scope
2015-03-22 18:49:21 +00:00
Kp
945914f1d6
Enable -Wuninitialized, -Wempty-body, -Wignored-qualifiers, -Wunused
2015-03-22 18:49:21 +00:00
Kp
91d31b1952
Wrap object signature in subtype
2015-03-22 18:49:21 +00:00
Kp
d9bfced915
Blacklist moving _REENTRANT to dxxsconf.h
...
Passing -pthread implies -D_REENTRANT, so if -D_REENTRANT is moved to
dxxsconf.h, then _REENTRANT is defined twice.
2015-03-22 18:49:21 +00:00
Kp
28a5b70c7c
Remove write-only osasmdef
2015-03-22 18:49:21 +00:00
Kp
565019f880
Remove unused movie_table_secret
2015-03-22 18:49:21 +00:00
Kp
3da71f79cc
Move WORDS_BIGENDIAN functions into #ifdef guard
2015-03-22 18:49:21 +00:00
Kp
90f99c8baa
Use any_of to search system_keys
2015-03-22 18:49:21 +00:00
Kp
ce1844bf93
Remove bogus test
...
Global arrays are never placed at NULL.
2015-03-22 18:49:21 +00:00
Kp
08c0c3768c
Remove unused gr_set_draw_buffer
2015-03-22 18:49:21 +00:00
Kp
ce028fc843
Move Object_type_names to dumpmine
2015-03-22 18:49:21 +00:00
Kp
2f99b894f0
Remove unused state_text
2015-03-22 18:49:21 +00:00
Kp
373becd588
Remove D2-unused mode_text
2015-03-22 18:49:21 +00:00
Kp
6e06c6893f
Remove bogus assertion
...
Stack variables are never placed at NULL.
2015-03-22 18:49:21 +00:00
Kp
7840885473
Fix clang -Wparentheses-equality warnings
2015-03-22 18:49:21 +00:00
Kp
7bf49fe551
Fix clang -Wmissing-braces warnings
2015-03-22 18:49:21 +00:00
Kp
08f6ad4bc7
Enable nested INI files
2015-03-22 18:49:21 +00:00
Kp
098bd2a9df
Move exception std::string
2015-03-22 18:49:21 +00:00
Kp
9ddea5f570
Reduce lifetime of Args
2015-03-22 18:49:20 +00:00
Kp
65ff319ebb
Use ntstring for LastMission
2015-03-22 18:49:20 +00:00
Kp
af7b08abac
Convert some GameCfg flags to bool
2015-03-22 18:49:20 +00:00
Kp
8ffb2c7f45
Use newmenu_do2 for newmenu_doreorder
2015-03-22 18:49:20 +00:00
derhass
2cd73b6dfe
Import the syncgl patch based on 0.58.1 into unification code base
...
I also changed the command line arguments a bit, gl_syncmethod and
gl_sycnwait are used now. Furthermore, I added the ew mode AUTO. This is
a conservative mode and the default for now: if GL_ARB_sync is available,
use the FENCE_SLEEP mode, otherwise, disable it completely.
Conflicts:
include/args.h
misc/args.c
similar/arch/ogl/gr.cpp
2015-03-22 18:17:11 +01:00