jacob1
|
3fc84495ed
|
Merge pull request #183 from mniip/rb
RequestBroker fixes
|
2013-10-30 12:05:47 -07:00 |
|
mniip
|
41e058e3b2
|
Fix a few cpu time leaks in request broker and HTTP, also add a global sleep function
(and why did HTTP.c have it's own copy of mystrdup anyway)
|
2013-10-30 21:39:30 +04:00 |
|
jacob1
|
0180c9b15a
|
fix remaining warnings, fix compiling errors when using --release
|
2013-10-29 23:55:10 -04:00 |
|
jacob1
|
45bf0dfcdb
|
Merge pull request #180 from mniip/warnings
Warnings
|
2013-10-29 19:24:20 -07:00 |
|
mniip
|
3625bd407e
|
moar const
|
2013-10-30 05:07:27 +04:00 |
|
mniip
|
bf908bbfbf
|
Fix various warnings, remove silly useless NO_INLINE system, remove the need for -fkeep-inline-functions
|
2013-10-30 04:47:07 +04:00 |
|
mniip
|
f7f24a9804
|
D:^H^Hfix newlines at end of files
|
2013-10-30 04:41:04 +04:00 |
|
mniip
|
71d107aac2
|
_proper_ typing system using a union instead of multicast void*
|
2013-10-30 04:38:39 +04:00 |
|
mniip
|
9183fa1755
|
apparently Ximon hates const; a lot;
added a bunch of const everywhere, had to modify a few functions to be const-compliant
|
2013-10-30 04:38:13 +04:00 |
|
Simon Robertshaw
|
8b45c8f9e8
|
Merge remote-tracking branch 'china-richway2/CutGlitch' into develop,
closes #176
|
2013-10-29 21:46:33 +00:00 |
|
Simon Robertshaw
|
67c82ee283
|
Quick fix: Fix dummy key defs used by renderer and other non-input builds
|
2013-10-29 20:51:44 +00:00 |
|
Simon Robertshaw
|
3f5b91f8a7
|
Increment version number
|
2013-10-29 20:08:09 +00:00 |
|
Simon Robertshaw
|
2d22776a2c
|
Iterate through signs in reverse order when seeking for click events in order to ensure when clicking on stacked signs the top-most sign is detected
|
2013-10-29 19:59:13 +00:00 |
|
Simon Robertshaw
|
f2e28ee667
|
Merge branch 'feature_sparksigns' into develop
|
2013-10-29 19:43:02 +00:00 |
|
Simon Robertshaw
|
e78dcae851
|
Merge branch 'master' into develop
|
2013-10-29 19:39:52 +00:00 |
|
jacob1
|
a4da2566ec
|
fix virus graphics
|
2013-10-26 12:10:10 -04:00 |
|
jacob1
|
48ecbce554
|
f5: reload sim, f2: screenshot f3: toggle extra HUD
|
2013-10-26 00:17:06 -04:00 |
|
jacob1
|
692f4b18c2
|
fix sim.decoBox arguments, add a sim.canMove function
|
2013-10-26 00:00:55 -04:00 |
|
Simon Robertshaw
|
30d985ba77
|
Only cancel click events clickable signs (not all signs)
|
2013-10-26 01:02:20 +01:00 |
|
Simon Robertshaw
|
aa09c0e753
|
Reject {b:1|blah} signs
|
2013-10-25 20:40:45 +01:00 |
|
jacob1
|
479528eaef
|
--copy_env copies LIBPATH (test to fix windows crosscompile)
|
2013-10-25 15:18:40 -04:00 |
|
jacob1
|
2ffe175c1b
|
fix crosscompiling, --lua-dir was being ignored
|
2013-10-25 12:05:30 -04:00 |
|
jacob1
|
a6b5b60c20
|
Merge pull request #178 from mniip/x11-clipboard
fix copy and paste in the same tpt window on SDL/Linux/X11
|
2013-10-24 14:08:52 -07:00 |
|
mniip
|
5d3520d18c
|
fix copy and paste in the same tpt window on SDL/Linux/X11
|
2013-10-25 00:46:41 +04:00 |
|
jacob1
|
79a2ac3103
|
fix issue with FILT PHOT scattering
|
2013-10-23 21:01:06 -04:00 |
|
unknown
|
12261e263d
|
fix bug where Ctrl+X don't delete stacked particles
|
2013-10-23 21:06:19 +08:00 |
|
Simon Robertshaw
|
d9f1762da0
|
Merge branch 'develop' of https://github.com/simtr/The-Powder-Toy into develop
|
2013-10-20 15:38:40 +01:00 |
|
jacob1
|
dd73a7244f
|
reduce / prevent PROT in fusion even more
|
2013-10-20 10:37:28 -04:00 |
|
Simon Robertshaw
|
e8c53dc3e8
|
Remove old unfinished virtual machine and Lua bindings for it
|
2013-10-20 15:33:06 +01:00 |
|
jacob1
|
b4761e47dd
|
fix Sconscript
|
2013-10-20 09:54:09 -04:00 |
|
Simon Robertshaw
|
b59c381177
|
Do not allow 't/c' signs to lack an ID
|
2013-10-19 22:10:53 +01:00 |
|
Simon Robertshaw
|
8f4296ac39
|
Spark sign tool, {b|sometext}, when the sign is clicked, the a spark will be created at the signs position. Also MouseDown events that draw particles from being triggered when clicking on a sign
|
2013-10-19 18:59:49 +01:00 |
|
Simon Robertshaw
|
cebd28148d
|
Minute performance improvement for Sign.getText
|
2013-10-19 17:22:43 +01:00 |
|
jacksonmj
|
eea006ad6f
|
SConscript changes from Doxin - option for scons to copy environment variables CC, CXX, LD, CFLAGS
|
2013-10-19 14:03:37 +01:00 |
|
jacob1
|
6edb96ee51
|
fix bottom row of saves in the save browser being cut off
|
2013-10-18 16:57:53 -04:00 |
|
jacob1
|
fd6da26b73
|
fix not being able to select / see all elements in menus with tons of elements
|
2013-10-18 16:36:37 -04:00 |
|
jacob1
|
ba43e4d238
|
revert b17ef7f938 (couldn't figure out better fix for the new PSTN bug), fix annoyance with clicking on save comments changing pages
|
2013-10-18 16:13:40 -04:00 |
|
jacksonmj
|
02a4c17d72
|
Ignore invalid walls in some old saves, so that they load correctly
E.g. save 10631 from old server
|
2013-10-17 16:09:38 +01:00 |
|
jacksonmj
|
132755525c
|
Fix incorrect search page count
|
2013-10-17 16:09:28 +01:00 |
|
jacob1
|
c4dcb37de4
|
PROT with 0 life doesn't die
|
2013-10-10 17:13:11 -04:00 |
|
jacob1
|
d1e75c7a50
|
make PROT lasers easier to make, adjust velocities needed to make things when smashing PROT together, use FIRE_BLEND for PROT graphics
|
2013-09-28 20:31:35 -04:00 |
|
jacob1
|
8fc39d659c
|
VIRS only burns with PLSM, and has the NO_DECO graphics flag
|
2013-09-28 19:45:15 -04:00 |
|
jacob1
|
13d89ce9e1
|
Fix tpt.get_numOfParts, add "C" next to temperature in HUD
|
2013-09-28 16:58:01 -04:00 |
|
jacob1
|
c480c9ea19
|
Merge branch 'HEAD' of https://github.com/FacialTurd/The-Powder-Toy.git
|
2013-09-27 17:41:46 -04:00 |
|
jacob1
|
48f1adb038
|
fix min and max in VS2013
|
2013-09-27 17:39:16 -04:00 |
|
jacksonmj
|
ceca61114a
|
Fix crash when trying to convert StringType to PointType
|
2013-09-27 19:41:12 +01:00 |
|
jacob1
|
44b7c4f8f4
|
Merge pull request #168 from liquidcaesium/patch-2
Decimal number support
|
2013-09-27 08:53:53 -07:00 |
|
liquidcaesium
|
65640ee6af
|
Decimal number support
|
2013-09-27 18:52:47 +03:00 |
|
jacob1
|
bc6a380c4c
|
Merge pull request #165 from liquidcaesium/patch-1
LCRY + PROT = LCRY + PHOT
|
2013-09-24 08:03:02 -07:00 |
|
liquidcaesium
|
a376b72b36
|
LCRY + PROT = LCRY + PHOT
Protons passing through active LCRY get turned into photons slowly, functioning as a powered converter in that manner.
|
2013-09-24 17:58:35 +03:00 |
|