scp-fs2open/fs2open.github.com
1
0 Fork 0
mirror of https://github.com/scp-fs2open/fs2open.github.com.git synced 2026-11-09 17:52:08 -10:00
Code Issues Packages Projects Releases 1 Wiki Activity
10,347 Commits 63 Branches 1,529 Tags
032c19e8894069ffbf4be2bc4e731455238beb19
Commit Graph
8885 Commits
Author SHA1 Message Date
asarium 575091aea4 Add unified dialog handling 
This also changes the lables on the dialog to make sense and also unifies Int3 behavior by using a function provided by SDL.
 2015-06-06 14:53:26 +02:00
asarium 92556a5116 Fix outwnd on Unix 2015-06-05 00:08:24 +02:00
asarium 2d47bcd9ad Replace Sleep with os_sleep 2015-06-03 16:20:39 +02:00
asarium 7aef2c5eaf Merge branch 'master' into antipodes 2015-06-03 12:50:21 +02:00
MageKing17 859405b62e Merge pull request #149 from SamuelCho/mantis3163 
Refactored how color setting is done for model rendering. Fixes Mantis 3163
 2015-05-30 19:24:15 -07:00
Goober5000 74ae0a9395 Merge pull request #148 from SamuelCho/mantis3161 
Fix for Mantis 3161. Corrected model debug rendering when calling the immediate version of model rendering.
 2015-05-30 18:13:05 -04:00
Goober5000 aa0d424699 Merge pull request #150 from SamuelCho/skybox_render_order 
Eliminate sorting of draw calls for skyboxes for correctness.
 2015-05-30 13:03:33 -04:00
SamuelCho 0c9996c32b Rectified jump nodes not rendering in FRED. Fixes Mantis 3162. 2015-05-29 23:37:50 -07:00
SamuelCho a7c1e29bf6 Eliminate sorting of draw calls for skyboxes for correctness. 2015-05-29 22:58:28 -07:00
SamuelCho 2ba39e6b6d Refactored how color setting is done for model rendering. Fixes Mantis 3163. 2015-05-29 21:54:33 -07:00
SamuelCho 44de943a99 Fix for Mantis 3161. Corrected model debug rendering when calling the immediate version of model rendering. 2015-05-29 19:47:23 -07:00
asarium 0c705fee6f Merge branch 'master' into antipodes 
Conflicts:
	code/debugconsole/timerbar.cpp
	code/graphics/gropengl.cpp
	projects/MSVC_2010/code.vcxproj
	projects/MSVC_2012/code.vcxproj
	projects/MSVC_2012/code.vcxproj.filters
 2015-05-29 17:47:58 +02:00
asarium badbe4a239 Remove unused timerbar files 2015-05-29 16:31:41 +02:00
Fabian Woltermann 3b90519be4 Merge pull request #144 from asarium/antipodes_/haptic 
[Antipodes] Add some debug code to sdl haptic initialization
 2015-05-28 16:32:38 +02:00
Fabian Woltermann 0311484e12 Merge pull request #143 from asarium/antipodes_/cleanup/endian 
[Antipodes] Unify byte order detection using SDL
 2015-05-28 16:32:05 +02:00
asarium d59dd99d28 Add some debug code to sdl haptic initialization 2015-05-28 15:43:00 +02:00
asarium 7eaaf94342 Unify byte order detection using SDL 2015-05-28 14:41:13 +02:00
asarium ffcb4ca268 Use the new outwnd.cpp on every platform 2015-05-28 13:57:47 +02:00
asarium acccaa929d Fix compilation under linux 2015-05-28 13:56:07 +02:00
asarium e0ce4737ec Clean outwnd.cpp 
It had a lot of dead code related to the unused debug output window.
 2015-05-28 13:18:32 +02:00
asarium 4b6041980e Merge branch 'master' into antipodes 
Conflicts:
	code/osapi/osapi.cpp
 2015-05-28 13:07:57 +02:00
asarium e0c919baea Change enum class back to enum 2015-05-28 11:34:31 +02:00
asarium a7efca662d Make the joystick system use GUIDs to identify the joysticks 2015-05-28 11:34:30 +02:00
Fabian Woltermann 9140069a85 Merge pull request #138 from asarium/antipodes_/cleanup/joy 
[Antipodes] Remove now unused functions
 2015-05-28 11:23:22 +02:00
Fabian Woltermann fae5f227b7 Merge pull request #137 from asarium/antipodes_/cleanup/mouse 
[Antipodes] Remove unneded functions from mouse.h/.cpp
 2015-05-28 11:22:56 +02:00
asarium 13f22d0ac9 Remove now unused functions 2015-05-27 15:50:42 +02:00
asarium 90efc5d1b1 Remove unneded functions from mouse.h/.cpp 2015-05-27 15:07:15 +02:00
asarium d6460398e6 Update externalcode to use SDL to do DLL loading 2015-05-27 15:01:40 +02:00
Lari Nieminen 8fd0bf3f7f Added a $Model Icon Direction ship table entry for overriding the angle from which ship icons are rendered from. 2015-05-27 12:19:06 +03:00
Fabian Woltermann d4d4868fe7 Merge pull request #128 from asarium/antipodes_/resolutionFix 
[Antipodes] Pick a better default resolution
 2015-05-27 11:11:50 +02:00
Fabian Woltermann af79c18752 Merge pull request #132 from z64555/ap-mousewheel 
Expands mouse functionality.
 2015-05-27 10:39:22 +02:00
z64555 3a0b78366d Some documentation on the MOUSE_BUTTON and MOUSE_WHEEL defines 2015-05-27 03:31:29 -05:00
z64555 c2e72b0098 can haz better bool algea-bra? 2015-05-27 03:25:35 -05:00
z64555 56f9f608be Merge pull request #119 from The-E/dedicated_gpu 
Use high-performance GPU by default.
 2015-05-27 03:13:49 -05:00
z64555 69b845ef83 Adds mousewheel functions in addition to support for X1 and X2 buttons. These currently take up the same mappings as joy buttons 4 through 9. 2015-05-27 03:06:03 -05:00
Fabian Woltermann 258662ff4c Merge pull request #104 from MageKing17/feature/subspace-beams 
Subspace Beams
 2015-05-27 10:00:44 +02:00
Fabian Woltermann a0ed1ac897 Merge pull request #125 from ln-zookeeper/master 
Added a $Thruster Glow Noise Mult ship table entry for decreasing/inc…
 2015-05-27 09:56:45 +02:00
asarium c5cf337365 Only set processor affinity if a commandline flag is present 2015-05-27 00:31:08 +02:00
asarium 5471cafea5 Readd resolution switch 2015-05-26 19:57:00 +02:00
asarium 178c69b212 Fix warnings 2015-05-25 22:09:35 +02:00
asarium a7e8ecfe07 Use the desktop size to initialize a default video card config 2015-05-25 22:09:34 +02:00
asarium 9d7b3dcb11 Merge branch 'master' into antipodes 
Conflicts:
	projects/MSVC_2012/code.vcxproj
	projects/MSVC_2012/code.vcxproj.filters
 2015-05-25 15:57:48 +02:00
Lari Nieminen 72a082c9eb Added a $Thruster Glow Noise Mult ship table entry for decreasing/increasing the effect of noise applied to the glow radius. 2015-05-23 00:11:43 +03:00
MageKing17 67a87a33f3 Change if-elseif chain to switch statement. 
Somewhat easier to read this way.
 2015-05-22 12:38:13 -07:00
MageKing17 b2cff0788a Make these assertions more clear. 2015-05-22 12:37:19 -07:00
MageKing17 fa61278c10 Merge branch 'master' of ssh://github.com/scp-fs2open/fs2open.github.com into feature/subspace-beams 2015-05-22 12:32:34 -07:00
Lari Nieminen 81f7d272fd Merge branch 'master' of https://github.com/scp-fs2open/fs2open.github.com 2015-05-21 18:35:32 +03:00
The E ef9ae017b5 Make sure we use the same calling convention both times 2015-05-19 21:21:54 +02:00
The E 2c626b4eec According to AMD and NV, these _should_ force their drivers into high-performance mode 2015-05-19 20:48:01 +02:00
MageKing17 cac6737541 Fix a couple FRED warnings. 
Change a couple instances of setting a DWORD_PTR to -1 by explicitly casting it to a DWORD_PTR.
 2015-05-19 11:39:36 -07:00