jacksonmj
34567bc496
Merge pull request #247 from ryanmjacobs:fix_pointer_checks
2015-05-16 02:19:08 +01:00
jacksonmj
26e170abcd
Merge branch 'develop'
2015-05-15 17:24:06 +01:00
jacob1
cee08b2024
On first run, set scale to 2 if screen size is large enough
2015-05-14 23:22:20 -04:00
jacob1
0a2b60627f
change left tooltip when a local save is open
2015-05-14 22:34:28 -04:00
jacob1
8e7e8e0670
some changes to LIGH creation (mostly from lua)
2015-05-11 20:50:10 -04:00
jacob1
fef767335f
remove loggedIn variable, small change to tooltips
2015-05-11 10:53:05 -04:00
jacob1
16b7f7d7bf
Merge pull request #254 from boxmein/offline-saving
...
Save to HDD by default when not logged in
2015-05-11 10:51:11 -04:00
jacob1
b1fc134204
fix crash with high speed photons in loop edge mode
2015-05-10 21:48:09 -04:00
jacob1
dd102c1f11
fix possible crash when PROT removes spark on disabled elements
2015-05-10 21:16:53 -04:00
jacob1
aa854557f7
fix WOOD sometimes creating water when burning
2015-05-10 20:55:03 -04:00
boxmein
7145cacbb9
implement HDD saving by default in GameView. update tooltips to describe behaviour.
2015-05-01 15:55:22 +03:00
boxmein
424d1d4b47
when you're not logged in, displys a not-highlighted HDD save button
2015-05-01 15:54:41 +03:00
boxmein
bf001dfd77
enable Ctrl behaviour (eg sae to HDD) without highlighting
2015-05-01 14:44:51 +03:00
boxmein
56d04fcde8
add new form of enableCtrlBehaviour for un-highlighted HDD saving
2015-05-01 14:44:22 +03:00
jacksonmj
38e21c8236
Fix crash when STOR is next to PIPE and has an invalid tmp value ( http://tpt.io/~1768004 )
2015-04-10 14:23:58 +01:00
jacksonmj
72329af09d
Fix DLAY delay changing during save+load
...
by rounding temperatures to nearest instead of always flooring.
Effect on DLAY delay:
Room temperature offset - loaded as whole number of degrees C, so rounding to nearest deg C gives the same number as flooring.
Full - loaded as whole number of K = original whole deg C - 0.15. Rounding to nearest deg C means the whole deg C delay from before saving is used as the number of frames to delay, instead of deg C - 1 if flooring was used.
2015-03-27 17:39:05 +00:00
jacksonmj
a9e2445675
Merge pull request #250 from wolfy1339/scons-libraries-names
...
Fix library names
2015-03-17 00:22:47 +00:00
wolfy1339
6606d72df0
Fix compiling on Windows
2015-03-16 20:00:55 -04:00
jacob1
fc5f3671f1
new function sim.clearRect, plus fix rounding errors breaking ctrl+x
2015-03-12 00:54:27 -04:00
mniip
1eb8940c9a
Fix LUA_R_INCL not being used on linux
2015-03-06 00:17:25 +03:00
jacksonmj
84f6ede2b8
Fix for commit d71a0d98
: also adjust melting point of BRMT(TUNG) based on TUNG HighTemperature value
2015-03-05 00:14:26 +00:00
jacksonmj
8f57c9a6c7
Correct return type for TPTScriptInterface::parseInt
...
so that large integers don't get changed into slightly different values by rounding caused by conversion to a float and back again.
2015-03-01 15:52:15 +00:00
jacob1
a422e43beb
visual studio error fix + warning fix
2015-02-25 18:56:50 -05:00
jacksonmj
91e871d0ea
PSTN: allow zero or negative contributions towards movement amount
...
Note that final movement amount < 0 means no movement, it will not reverse the movement direction. This is to keep interpretation of inputs simple - PSCN always extends, other conductors always retract.
2015-02-24 22:48:31 +00:00
jacksonmj
cd71a6dff7
Float rounding strikes again - set destination coords using integers when moving particles with PSTN
...
instead of adding a delta value to the current position, which might not give the correct result. Particles (except solids) were on rare occasions ending up at a point 1 pixel away from where they should be after being pushed by PSTN. This led to stacking, and in the case of save 1732622 after changing BIZS to a liquid, to disintegration of the save.
(TPT++ version of commit 2ad996dfe621887355f8532f1262c306421bc2de in jacksonmj fork)
2015-02-23 13:35:17 +00:00
jacksonmj
d71a0d98eb
Allow TUNG melting point to be changed from Lua
...
Also set lava LowTemperature threshold to MAX_TEMP, to simplify changing melting points from Lua.
2015-02-23 13:24:27 +00:00
Ryan Jacobs
55a30673c4
Remove unnecessary pointer checks.
...
There are *no* more spacing issues. I used tabs exclusively.
Also, I made changes off of the develop branch.
Here's the Ruby regex that I used:
text.gsub!(/(( |\t)*)if ?\((.*)\) ?{?\n?( |\t)*(free ?\(|delete |delete\[\] )(.*)\)?;/, "\\1\\5\\6;")
2015-02-14 22:13:26 -08:00
jacob1
b06af530a5
fix lua5.2 compiling (that isn't defined until we include the headers ...)
2015-02-14 00:01:31 -05:00
jacob1
57d1b4916d
fix last two PVS-Studio bugs, closes #232
2015-02-13 21:45:22 -05:00
jacob1
316d0f1ace
--luajit and --lua52 compile options
...
no longer looks for lua 5.2 unless you tell it to
2015-02-13 18:20:52 -05:00
jacob1
03e07945e3
fix lua element update bugs, fixes #244
...
also add new mode for functions run before the normal update function
2015-02-13 14:18:55 -05:00
jacob1
84f13cfe63
fix compiling error on windows
2015-02-10 23:39:15 -05:00
jacob1
62040154d9
--luajit option (only tested on Linux for now)
2015-02-06 23:11:54 -05:00
jacob1
6cb78186be
sim.framerender function to simulate a certain number of frames
...
also remove particle debugging lua function now that there are key shortcuts
2015-02-06 20:34:07 -05:00
jacob1
2c0287b71d
PARTICLEDEBUG define which turns on some particle debugging key shortcuts
...
Also fix particle updating bug
2015-02-06 20:33:10 -05:00
jacob1
1840f4e39c
fix crash when uploading save
2015-02-04 00:37:25 -05:00
mniip
4fa02965bf
Clean up the EngineProcess loop
2015-02-04 04:13:51 +03:00
jacob1
b7fe998252
fix mouse coords at startup being 0,0, fix glitch that could make background windows fade completely to black
2015-01-31 14:09:50 -05:00
jacob1
94e635b65d
fix negative tmp sing possibly generating max particles
2015-01-17 14:45:20 -05:00
jacob1
8c1db513f6
make sure ELEC dies in ELEC+NEUT reaction
2015-01-17 14:06:38 -05:00
jacob1
b1a3c404b6
fix platform / sconscript flag specific warnings, --no-warnings no longer defaults to true
2015-01-16 23:39:42 -05:00
jacob1
ace9e36cc6
fix ALL the warnings
...
mostly just using more size_t. Also do some formatting around if statements
2015-01-16 22:35:32 -05:00
jacob1
efd69b208d
fix a ton more errors in the interface code, including all the -Wreorder ones
2015-01-16 19:58:39 -05:00
jacob1
54d985f975
gcc warning fixes (up to lua files)
2015-01-16 17:26:13 -05:00
jacob1
7676f739a0
Merge pull request #239 from wolfy1339/patch-1
...
Fix SConscript error when using --wall
2015-01-12 18:50:59 -05:00
wolfy1339
fdda2fb123
Fix SConscript error when using --wall
2015-01-11 15:54:06 -05:00
jacob1
3a52453561
move more stuff around, remove loop through particles to decrease life and put it in the pmap one instead (like in my mod)
2015-01-11 14:36:40 -05:00
jacob1
577ae3400f
move some stuff around (without changes) in Simulation.cpp, add sim.updateParticles function
2015-01-11 13:17:18 -05:00
jacob1
dce874484a
fix all the gcc warnings in the element files (except one in PSTN) + all the unused variable warnings
2015-01-10 22:43:33 -05:00
jacob1
a5797f6262
reset length when running step functions in case a step was unregistered, fixes first half of #210
...
also cleanup / make it easier to read
2015-01-10 20:10:42 -05:00