Alam Ed Arias
57091261d9
MSVC: fixed up MSVC project
2016-05-21 23:53:04 -04:00
Alam Ed Arias
3b610ead7d
Merge branch 'master' into next
2016-05-20 17:56:51 -04:00
Alam Ed Arias
9550f9626b
r_opengl.dll: UPX and static link libgcc
2016-05-20 17:36:46 -04:00
Alam Ed Arias
80611c2384
Merge branch 'master' into next
2016-05-19 18:54:21 -04:00
Alam Ed Arias
a7938783de
Merge branch 'next'
2016-05-19 18:36:27 -04:00
Alam Ed Arias
ff5587d1d5
Merge branch 'master' into next
2016-05-19 18:03:56 -04:00
Alam Arias
6db74c3b5b
Merge pull request #82 from MonsterIestyn/sdl-compiling-tweaks
...
Some SDL-related compiling tweaks
2016-05-19 12:06:38 -04:00
Monster Iestyn
c846b0ab23
Aren't some of these things already added later in sdl/Makefiles.cfg?
...
* -lSDL2_mixer is already added to SDL_LDFLAGS by default, unless NOMIXER=1 is set
* -DSDLMAIN should also be added to OPTS by default for MINGW=1 builds, unless NOSDLMAIN=1 is set
2016-05-19 16:51:05 +01:00
Alam Ed Arias
e2a5783521
Merge branch 'master' into next
2016-05-19 01:39:45 -04:00
Alam Ed Arias
30b999c6db
appveyor: no more depend ccache builds
2016-05-19 01:32:25 -04:00
Alam Ed Arias
27578edab6
appveyor: display version of ccache and force use of ccache
2016-05-19 01:20:38 -04:00
Alam Ed Arias
d73a6c9833
appveyor: copy UPX to the Mingw's bin folder, again
2016-05-19 01:10:58 -04:00
Alam Ed Arias
6f2cc1498c
appveyor: copy EXE to the Mingw's bin folder, again
2016-05-19 01:06:47 -04:00
Alam Ed Arias
eb6d8f180b
appveyor: copy EXE to the Mingw's bin folder
2016-05-19 01:00:29 -04:00
Alam Ed Arias
dbde012c8d
appveyor: debug unzip/copy lines
2016-05-19 00:53:54 -04:00
yoshibot
8fbc0d7f69
remove bogus homebrew gzip; objdump allowed to fail in that way
2016-05-18 23:52:06 -05:00
Alam Ed Arias
d08418dcff
appveyor: fixup unzipping NASM and UPX
2016-05-19 00:44:01 -04:00
Alam Ed Arias
e8cce0af8d
appveyor: download and install nasm and upx, also debug ccache
2016-05-19 00:37:22 -04:00
Alam Ed Arias
6064da9347
appveyor: fix mistake on naming the build archives
2016-05-19 00:18:40 -04:00
Alam Ed Arias
15969887ec
aapveyor: readded drive letter...
2016-05-18 23:55:30 -04:00
Alam Ed Arias
ded9dd7940
appveyor: add correct ccache folder to cache and add CONFIG to build archive
2016-05-18 23:48:29 -04:00
Alam Ed Arias
6ee81f7b1d
appveyor: fixup cache section
2016-05-18 23:38:36 -04:00
Alam Ed Arias
86f418f312
appveyor: use ccache and try to build both SDL and DD
2016-05-18 23:37:05 -04:00
yoshibot
bb90c8366a
Fixed bugs in OS X alert code and simplified; added more NULL checks in OS X resource code
2016-05-18 22:13:53 -05:00
Alam Ed Arias
6aa1aeb838
build: include own copy of SDL2main
2016-05-18 22:25:06 -04:00
Alam Ed Arias
ef488d2b03
MSVC: link to SDL2main, then SDL2
2016-05-18 21:41:27 -04:00
Alam Ed Arias
7193df7f75
MSVC: turn off SAFESEH for SDL release builds
2016-05-18 21:28:53 -04:00
Alam Ed Arias
ab9f2ea831
MSVC: fixup Debug build linked
2016-05-18 21:11:30 -04:00
yoshibot
df89563882
Add a way to build OS X binaries (not .app) through Makefiles
2016-05-18 19:14:53 -05:00
Alam Ed Arias
7058baed44
Merge branch 'master' into next
2016-05-18 20:07:27 -04:00
Alam Ed Arias
205d16e3af
added unsaved project changed
2016-05-18 20:05:24 -04:00
Alam Ed Arias
a4b0f89caf
MSVC: fixedup SDL2 build
2016-05-18 20:01:50 -04:00
Alam Ed Arias
d05957e2bb
build: this script needs bash, not ash
2016-05-18 18:16:57 -04:00
Alam Ed Arias
5612d24c32
appveyor: no more need to download SDL2 and SDL2_MIXER SDK
2016-05-18 18:08:32 -04:00
Alam Ed Arias
bbf9f5adc8
Makefile: use built-in SDL2 and SDL2_mixer for Mingw32 and Mingw64
2016-05-18 16:54:55 -04:00
Monster Iestyn
b4cf7fbc97
Fix player 1 and player 2 affecting whether the other can see skyboxes or not
2016-05-18 18:20:56 +01:00
Monster Iestyn
1e50691e08
Remove extern for unused "oncontinuescreen" variable
2016-05-18 17:41:11 +01:00
Alam Ed Arias
f3d0ecbe9d
gitattributes: do not check whitespace for included libs
2016-05-18 10:38:29 -04:00
Inuyasha
ab7af594d9
Merge branch 'nights-hotfix' into 'next'
...
NiGHTS hotfix
Fixes the following issues relating to playing as NiGHTS Super Sonic that apparently popped up between 2.1.14 and next (mostly due to the changes to SRB2's trig stuff it seems):
* Super Sonic drifts to the side at some angles around an axis, and is unable to go directly upwards or downwards as a result
* Drilling to the side when on the ground causes the drill sound to constantly restart
* CEZS's start not actually being lined up properly with the first axis means the player is not able to go backwards along the track (because the player is not actually aligned with the track properly, preventing you from touching the attached line transfer)
* trying to hug some walls such as the tall wall before the library section of CEZS allows Super Sonic to go through them
These fixes needs proper testing before this branch can be merged in, in case they accidentally break other things as a result or something.
See merge request !71
2016-05-18 07:09:05 -04:00
Alam Ed Arias
b566036661
libs: include SDL2 and SDL2_mixer
2016-05-18 01:53:35 -04:00
Alam Ed Arias
5aa48cf7ca
fixed up old VS 2010 project to work with VS 2015, tested with FMOD/DirectX
2016-05-18 01:35:35 -04:00
yoshibot
928c6acf4b
Simplify OS X bundle resource discovery, fix a sigsegv
2016-05-17 22:56:49 -05:00
Inuyasha
f07585191b
copyright dates/statements updated and such
...
(no actual SLOC changes)
2016-05-17 17:42:11 -07:00
Alam Ed Arias
9900a290ce
Merge branch 'master' into next
2016-05-16 16:33:05 -04:00
Alam Ed Arias
a12733f480
travis: move mkdir to before_script step
2016-05-16 16:27:41 -04:00
Monster Iestyn
e3dac00aa9
If player is at wrong distance from axis, correct x/y position in a similar fashion to how momentum is set for homing attacks. Don't use trig here for most cases since that just re-introduces the side drift issue and friends all over again.
...
This fixes the CEZS issue where the player start is not actually on the track, preventing the player from going backwards until they hit a wall.
2016-05-16 19:00:34 +01:00
Monster Iestyn
ea1cac8e24
Fix NiGHTS drill constantly starting if you're moving sideways on ground
...
Also disabled normal mobj friction from NiGHTS and tweaked bouncing code just in case?
2016-05-15 22:09:22 +01:00
Monster Iestyn
89ce257248
Fix all the NiGHTS issues in one fell swoop (assuming they are fixed, that is, lol)
...
Basically I kind of worked around any potential trig inaccuracies by not using the player position directly for setting momx/momy. This way, if player->angle_pos == player->old_angle_pos, momx/momy are zero
2016-05-14 23:57:56 +01:00
Monster Iestyn
f579a12d2c
Fix up more Lua error messages to be more meaningful (and work properly, in some cases)
2016-05-14 23:52:40 +01:00
Monster Iestyn
947e8c56ec
Removed redundant momx/momy assignment from NiGHTS movement code.
...
Specifically, the being-hit code, where P_NightsTransferPoints is called afterwards anyway
2016-05-14 22:52:12 +01:00
