Techwizz/Gobligine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
16717 commits 1 branch 0 tags 200 MiB
Commit graph

16717 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tim Felgentreff
fc2bc028d5 Merge pull request #186 from Wargus/tim/fix-screenshots-with-shaders 
Fixes for screenshot code with opengl
 2016-03-15 07:21:21 +01:00
Tim Felgentreff
542fb43c38 revert unintentional change 2016-03-15 00:12:19 +01:00
Tim Felgentreff
15b6eaa48f do proper error checking when testing if shaders are supported, so when the hardware won't accept the shader or the program (even though the opengl lib supports it), we don't get an upside down image any longer 2016-03-15 00:09:42 +01:00
Tim Felgentreff
8c314be70d account for viewport sizes and shaders in screenshot code, don't rely on std::vector internal organization 2016-03-14 23:50:01 +01:00
Tim Felgentreff
282212233f Merge branch 'master' of https://github.com/Wargus/stratagus.git 2016-03-07 12:10:32 +01:00
Tim Felgentreff
b81ed71ec1 Ship our own SDL.dll 2016-03-07 12:08:54 +01:00
Tim Felgentreff
1a4168d582 [skip ci] Document release process 2016-03-07 12:00:45 +01:00
Tim Felgentreff
a8397705be fix for last commit 2016-03-07 11:51:58 +01:00
Tim Felgentreff
668503a4e5 also bundle up the compiled binary+dlls (so windows games can ship them in their installers) 2016-03-07 11:35:59 +01:00
Tim Felgentreff
e30548c5a9 On Windows, also look for a local stratagus.exe 2016-03-07 11:27:16 +01:00
Tim Felgentreff
728edd2ba2 ship lua51.dll with stratagus 2016-03-07 11:15:25 +01:00
Tim Felgentreff
3db76e5cb6 Try to build for XP 2016-03-07 10:48:59 +01:00
Tim Felgentreff
54b89e3049 search and include libjpeg only for msvc 2016-03-06 18:29:07 +01:00
Tim Felgentreff
ebb0c39df6 enable stdio redirect for building 2016-03-06 14:26:31 +01:00
Tim Felgentreff
0778357cc3 redirect stratagus output to user directory (to avoid having to run as administrator) 2016-03-06 14:25:49 +01:00
Tim Felgentreff
8660af276a make sure we also find libjpeg when using mng (mng uses libjpeg) 2016-03-06 14:25:13 +01:00
Tim Felgentreff
9090edbbf4 we cannot ColorCycleAll in OpenGL mode 2016-02-22 16:27:34 +01:00
Tim Felgentreff
8efa0cc1d2 add getter for OpenGL state 2016-02-22 16:18:18 +01:00
Tim Felgentreff
35e14bc8e4 Merge pull request #177 from Wargus/tim/color-cycling 
Force re-generating the textures for color cycled graphics in OpenGL
 2016-02-16 11:32:00 +01:00
Tim Felgentreff
d57d31a59a Merge pull request #182 from Wargus/tim/build-over-buildings 
Allow building over decorative buildings without HP
 2016-02-16 11:25:49 +01:00
Tim Felgentreff
404898ed21 Allow building over decorative buildings without HP. Needed for war1gus roads. 2016-02-16 10:19:40 +01:00
Tim Felgentreff
a1df834bad Add DefineNewRaceNames function. Fixes #135 2016-02-15 17:20:11 +01:00
Tim Felgentreff
5782de578d Merge pull request #181 from Wargus/tim/network-issues 
Address some potential network desyncs
 2016-02-15 12:44:12 +01:00
Tim Felgentreff
c336223f22 undo accidental whitespace changes 2016-02-15 12:04:05 +01:00
Tim Felgentreff
005ce1d52b re-initialize the shared variables in network games 2016-02-15 12:01:02 +01:00
Tim Felgentreff
08d526d29e fix undefined behavior in astar (caught with valgrind) 2016-02-15 12:00:57 +01:00
Tim Felgentreff
e479f44eec * Revert "only show the out of sync message if we encounter this and are already". This reverts commit 7ee413e51f. 
* Revert "Set NetworkInSync to false if the sync seed or hash is wrong". This reverts commit 0ec82a7279.
* use SyncRand more consistently
 2016-02-15 12:00:51 +01:00
Andrettin
f879d7638e Fixed a potential desync cause due to units' facing being randomly set when created through a random number generating function that isn't s 2016-02-10 16:12:19 +01:00
Tim Felgentreff
7ee413e51f only show the out of sync message if we encounter this and are already 
out of sync for some other reason
 2016-02-07 13:21:00 +01:00
Tim Felgentreff
0ec82a7279 Set NetworkInSync to false if the sync seed or hash is wrong 2016-02-07 01:21:35 +01:00
Tim Felgentreff
b97ddec6c5 Merge remote-tracking branch 'origin/master' into tim/color-cycling 2016-02-05 15:38:45 +01:00
Tim Felgentreff
ce55f73c2b cache color cycling textures 2016-02-05 15:38:26 +01:00
Tim Felgentreff
02de191d47 do not attempt (and fail) to build mac bundle on linux 2016-02-04 15:08:59 +01:00
Tim Felgentreff
fe11cb4c9e debug printing 2016-02-04 15:02:00 +01:00
Tim Felgentreff
464c8866ea Fix #167 2016-02-04 11:10:30 +01:00
Tim Felgentreff
eef4d5fb20 Fix #134 2016-02-04 11:00:35 +01:00
Tim Felgentreff
0f33b231de try to figure out where the target finding crashes 2016-02-04 10:53:56 +01:00
Tim Felgentreff
77a090c76e [skip ci] Add a comment about optimizing opengl color cycling 2016-02-03 12:47:56 +01:00
Tim Felgentreff
5653afa0f6 Also undo the color cycling in opengl 2016-02-03 12:44:13 +01:00
Tim Felgentreff
182a02fcf4 Force re-generating the textures for color cycled graphics in opengl mode. 2016-02-03 12:38:58 +01:00
Tim Felgentreff
5b7bfd1275 replace C-style array with c++ vector for target finding 2016-02-03 10:10:39 +01:00
Tim Felgentreff
e49a0727b2 Merge pull request #176 from ckorn/patch-1 
Fix test for data extraction on non Windows system
 2016-02-02 22:58:22 +01:00
Christoph Korn
2e5db99837 Fix test for data extraction on non Windows system 
It was not able to find the file because of the backslash notation.
Use slash notation on non Windows systems to fix it.
 2016-02-02 22:27:27 +01:00
Tim Felgentreff
d7665c1a0a forgot to free memory after finding range targets 2016-01-15 16:13:49 +01:00
Tim Felgentreff
3387aab284 Merge pull request #174 from Wargus/tim/catapult-friendly-fire 
Refactor target searching for splash missiles to make friendly fire configurable
 2016-01-14 10:24:07 +01:00
Tim Felgentreff
86f4c2fce7 * add NoFriendlyFire flag to unittypes 
* refactor ranged attack target finding to honor the NoFriendlyFire flag
* let ranged attack target finding work with arbitrary distances
 2016-01-13 09:29:41 +01:00
Andrettin
ae35463621 Merge pull request #172 from marcelofg55/master 
Fixes deadlock and issue on windows with audio system
 2016-01-08 21:29:40 +01:00
marcelofg55
aa4d9045bd Fixed deadlock within the sound system 
Fixed issue on windows only that made the audio sluggish
 2016-01-08 15:25:34 -03:00
Tim Felgentreff
41d1de1b16 (hopefully) fix crash-at-exit on osx and win32 2016-01-07 17:28:05 +01:00
Tim Felgentreff
a7c4ade947 correct osx libs upload path 2016-01-07 16:34:25 +01:00