jacob1
8a0496e60a
another fix for lua key events
2016-07-17 18:19:00 -04:00
jacob1
b8cdf4ae2f
3 dots doesn't need to be a separate icon (running low on icon space)
2016-07-17 17:13:52 -04:00
SopaXorzTaker
17398dd201
RPEL's ctype sets the element it repels
2016-07-17 16:47:43 -04:00
Simon Robertshaw
85bdeae694
Merge branch 'master' of https://github.com/simtr/The-Powder-Toy
2016-07-17 21:34:29 +01:00
Simon Robertshaw
3b106b7c22
Crash fix for wall drawing when OpenGL is enabled.
2016-07-17 21:33:54 +01:00
cxi1
0c972469b8
Improve consistency of error messages, use InformationMessage instead of ErrorMessage
2016-07-17 16:27:13 -04:00
jacob1
4ec4b32021
Add font editor from my mod, add two new icons for favorites menu
2016-07-16 21:10:03 -04:00
jacob1
443c81e67a
extra sanity check (was needed in my mod)
2016-07-16 00:50:09 -04:00
jacksonmj
57a3121a51
Limit MERC tmp to valid range
...
This preents "anti-mercury" (negative tmp from console) and also
slightly reduces how overpowered it can be in walls (enormous positive
tmp from console).
2016-07-16 01:16:04 +01:00
jacob1
bc1dd6748c
Fix double screen mode fail
2016-07-13 00:15:57 -04:00
cxi
7251f645e4
Increase speed of MIX tool and make it work with liquids ( #306 )
...
* Make MIX tool work with liquids and gases
2016-07-12 23:34:08 -04:00
Simon Robertshaw
5b525852b4
More OS X compatibility fixes with OpenGL
2016-07-12 22:34:31 +01:00
Simon Robertshaw
4468462ce9
Sconscript: Symbols option when making optimised/release builds.
2016-07-12 22:34:03 +01:00
Simon Robertshaw
6cfaeb9c5c
OpenGL UI fixes for on OS X/all platforms
...
- Reinitialise textures after SDL_SetVideoMode
- Fix header includes and remove GLEW setup on OSX
2016-07-12 21:31:29 +01:00
Simon Robertshaw
b66ca770da
Performance optimisation for blitting loops and depth3d
2016-07-12 19:48:58 +01:00
Simon Robertshaw
0cf117a5f0
Better hack for library checking on OS X
2016-07-11 23:30:11 +01:00
jacob1
e8817489be
these --static flags should be optional
2016-07-10 21:08:16 -04:00
jacob1
8146598967
fix blank screen when hitting "Cancel" on double screen dialog
2016-07-10 17:38:19 -04:00
jacob1
a3865c8f49
remove debugging stuff
2016-07-09 19:07:03 -04:00
jacob1
16b93083d4
Changes to support starcatcher build server with updates
...
Cherry-picked from 3ddaec7b2a3ddaec7b2a3ddaec7b2a3ddaec7b2a3ddaec7b2a3ddaec7b2a
2016-07-09 19:00:54 -04:00
jacob1
b75c8318e4
add tpt.num_menus and tpt.menu_enabled functions
2016-07-08 20:33:01 -04:00
jacob1
88097496af
Allow hiding menusections
...
Cherry-picked from 75437c7d4c
2016-07-08 19:58:21 -04:00
jacob1
111468c672
Fix not being able to turn off FIND tool when a life element is selected
2016-07-08 19:41:55 -04:00
jacob1
e68dd74b68
less scary report message
2016-07-03 12:51:40 -04:00
jacob1
ecddfcbc0d
don't reset edge mode when saving local saves
2016-06-30 08:16:53 -04:00
jacob1
dfdee7afeb
delete UTF-8 BOMs
2016-06-25 12:16:40 -04:00
jacob1
4190946de5
fix warning+exit crash, fix menusection offset resetting when menus are rebuilt
2016-06-25 11:56:03 -04:00
Matthew Miller
083d488566
Added a favorites menu. ( #298 )
...
Added a favorites menu.
2016-06-25 11:55:18 -04:00
jacob1
9a18338476
remove debugging thing
2016-06-11 23:50:46 -04:00
jacob1
2a541bd2f5
fix for lua keydown events, send 'j' when ctrl+somekey is pressed, not ^J
2016-06-11 15:54:19 -04:00
jacob1
7e4924e7ab
windows pthread_t is uncooperative, just check this instead
2016-06-11 13:08:27 -04:00
jacob1
5b5390f822
attempted error fix
2016-06-11 12:57:13 -04:00
jacob1
337a929cc3
A few description updates from boxmein. Closes #282
...
I don't think we need to add the element name for elements like ACID in the description when it is already obvious
2016-06-11 11:00:06 -04:00
SopaXorzTaker
0af4b54bc3
extra NULL check
...
It is undefined behavior what happens when you try to call pthread_join on a NULL thread (which will happen if you close the game before opening the save browser). Seems to be harmless, but make sure we don't do that just in case --jacob1
2016-06-11 10:46:59 -04:00
SopaXorzTaker
c85ac21d84
Fix gravity field appearing after ctrl+z even if gravity is off, Fixes #293
2016-06-11 10:29:09 -04:00
jacob1
d63c6012c6
force a stacking check when undoing (id:1997880)
2016-06-11 10:21:25 -04:00
SopaXorzTaker
fbd75c6293
This effect is called "3D anaglyph" ( #292 )
2016-05-26 18:48:18 -04:00
jacob1
ce55c8e58b
Fix --opengl-render option. Please NEVER use this option though
2016-05-14 09:44:49 -04:00
jacob1
63ac47a270
update .life properly when using particle debug shortcuts
2016-04-30 10:50:48 -04:00
jacob1
64f81000cd
Fix typo
2016-04-27 00:00:28 -04:00
jacob1
a8427ef33a
only use -Wno-unused-result on Linux, also actually fix the unused results that we could possibly care about
...
Fixes cross compilers, TODO: I don't think scons can check if a flag exists but might support adding a test for that, even if through hacky means, like CheckFramework
2016-04-26 23:55:14 -04:00
jacob1
6624550dc1
fix a ton of build server warnings (they were all the same)
2016-04-26 23:28:52 -04:00
jacob1
7a18f6ec09
maybe compile fix
2016-04-26 23:22:36 -04:00
jacob1
1c15b426d5
Fix ctrl+MIX not actually doing anything, and shift+MIX being too powerful
2016-04-26 23:15:33 -04:00
jacob1
57be4ef498
'character' is always 0 in sdl keyup event, so just send 'key' instead to lua keyup events
2016-04-26 22:42:57 -04:00
jacob1
6b6bd67a9f
extra debugging thing for visual studio
...
I think this prevents random "exited with code 3" errors, but I can't remember ...
2016-04-23 11:39:06 -04:00
jacob1
5cab8f45f2
Fix 'n' toggle also resetting air
2016-04-23 11:39:06 -04:00
Simon Robertshaw
17cdf980cb
Remove commented code from MIX.cpp
2016-04-17 21:56:39 +01:00
Simon Robertshaw
e7b0e3f90d
Particle/powder mixing tool
2016-04-17 21:55:08 +01:00
jacob1
1171c308e1
Fix warnings, fix crash when ctrl+click opening a save
2016-04-02 20:47:50 -04:00
