matthew/The-Powder-Toy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,249 Commits 13 Branches 426 Tags 113 MiB
0514240629
Commit Graph

4249 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
jacob1
e92bbac700 fix some lua crashes (use more argument checking) 2015-01-10 18:59:20 -05:00
jacob1
4f6094136e fix renderer compile and make it create a "Save file invalid" sign when it can't render the save, fixes #97 2015-01-10 18:47:42 -05:00
jacob1
b2954a7f0a Publish button in browser (replaces Unpublish button when unpublished saves are selected) 
Works using the html page and isn't really the best way until @simtr implements Delete.json&Mode=Publish or something
 2015-01-10 18:18:28 -05:00
jacob1
1a50217acd better fix for thumbnails getting mixed up (static int instead of rand), fixes #96 2015-01-10 15:45:35 -05:00
jacob1
65a31bb1d1 more "thread safe" fix to save list refreshing problem 2015-01-10 13:43:15 -05:00
jacob1
1a2e3a11fc cancel drawing when the mouse moves in / out of the zoom window, fixes #228 2015-01-10 13:35:23 -05:00
jacob1
c325543402 refresh save list after unpublishing a group of them, fixes #238 2015-01-10 12:39:19 -05:00
jacob1
4a3a6dee30 improve .desktop file installed on linux 
escape Exec properly so paths with spaces or quotes work, and add Path key so that it starts in the right working directory
 2015-01-10 00:14:38 -05:00
jacob1
6eedc7a7a6 new linux icon: 48x48 (really displayed at 44x36) instead of 16x16 
really it's the same icon, it's also not the best, but the best I could make it look
 2015-01-09 22:40:48 -05:00
jacob1
0ad225d1fc update VIBR randoms, fix any VINE in old saves also 2015-01-07 19:32:49 -05:00
jacob1
be6551ceea fixes to rndstore in VIBR/VIRS, remove goto in PROT 2015-01-07 19:04:11 -05:00
Martin Ettl
34c85c262c Fix potential memory leaks. 
(Merging pull request #234, amended by jacksonmj: some leaks already fixed in develop branch.)
 2014-12-29 16:37:04 +00:00
Martin Ettl
93eb934322 Fix potential memory leak in src/Format.cpp 
(Merging pull request #233)
 2014-12-29 16:36:58 +00:00
jacksonmj
236ff08da9 Fix some problems noted in http://www.viva64.com/en/b/0298/ 
I've left some of the less important items, like SearchView.cpp "'then' statement is equivalent to the 'else' statement", and RequestBroker::Request::~Request, because I don't feel like spending a few days entirely rewriting those files at the moment (which is what I'd end up doing if I started fixing minor problems and refactoring...)

GameSave::readOPS - not changed. At some point we may have to move to a larger type for element IDs (probably two or four bytes), but PT_NUM isn't likely to be raised to the maximum value of that type immediately, so this check will be needed then. There should be an elements[partsData[i]].Enabled check in there too, but it might be a bit difficult - I'm not sure how to access a Simulation object from GameSave::readOPS...

Notes on changes:

Graphics::textsize, Element_FRZW::Element_FRZW - typos

Button::Draw - the extra case was originally used to invert the icon (draw it in black instead of in white) when the button was clicked. However, the icon colour is now automatically set depending on the background colour. (Note similar conditions "if(Enabled) { if(isButtonDown || (isTogglable && toggle)) " near the start of the function - same logic but in a different place, setting icon colour indirectly).

Simulation::transform_save - unused redundant function, everything uses GameSave::Transform which does much the same thing.

PreviewView::NotifySaveChanged - should be height==YRES/2, it's checking whether the preview image is the correct size, and resizing it if it isn't.

Element_FWRK::update - no idea why that line was there, even though it was my commit that originally added it...
 2014-12-25 17:09:35 +00:00
jacksonmj
3ea2d8013d Correct page count in save browser 2014-12-22 01:33:55 +00:00
jacob1
3b09c4bdbc change tooltips for the save upload button to make it more clear 2014-12-18 19:54:48 -05:00
jacob1
0f583f3bd8 fix PLSM spawning in fusion (allow some stacking), GRVT in O2 fusion 2014-12-15 15:52:08 -05:00
jacob1
35782fdd10 'l' always loads last save from disk (won't load cached deleted save) 2014-12-15 15:13:37 -05:00
cracker64
6410171bd5 Fix IRON rust 
Fix some randoms
 2014-12-06 16:23:45 -05:00
cracker64
a115e78952 More element optimizations! 
ACEL, changed a range check
DRAY, Fixed repetitive checking
GOLD, less rand()
PLNT, removed range checks, less rand()
PROT, used a switch()
VIBR, less rand()
VINE, less rand(), fixed growing along WOOD
VIRS, less rand()
 2014-12-06 15:43:11 -05:00
cracker64
783b2c1736 Stop PIPE graphics from creating a particle every frame. 
Remove temperature setting, this feature is beyond useless now, PROP+Lua are better ways to manually set pipe.
 2014-12-06 01:16:04 -05:00
jacob1
9fdcc28dac make close icon match the color of the button/text around it 2014-12-04 18:17:44 -05:00
jacksonmj
e25fac5037 Less layering of particles in fusion 
Fixes http://tpt.io/~1683916 - PLSM was created on top of DMND, which other particles then displaced, leading to lots of stacking and particles escaping through the DMND.
 2014-11-30 17:22:56 +00:00
jacob1
70a815a8c7 fix crash when PIPE finds PRTI with an invalid channel 2014-11-29 00:30:05 -05:00
jacob1
6da5b08fd2 fix for fast particles moving through VOID 2014-11-22 13:04:04 -05:00
jacob1
aa8fe86735 fix DEUT graphics (accidentally changed something) 2014-11-21 16:40:46 -05:00
jacob1
16ce3a68c0 more jacksonmj suggestions: save edgeMode in saves, BVBR absorption fix, life saving fix, DEUT graphics change, PROT fix, SOAP graphics fix 2014-11-21 15:41:22 -05:00
jacob1
e20f6b101b jacksonmj: "Allow ELEC to pass through GLOW, fixes ELEC->PHOT reaction in GLOW." f162984e22e5 + some parts of "Misc small fixes" 95cf5bd67c2b 2014-11-21 15:41:22 -05:00
jacob1
a182e925fe some elementpallete fixes + fix SPAWN2 ToolButton 2014-11-20 22:44:02 -05:00
jacob1
6ce2d5fe92 #define MAX_FIGHTERS + some fixes 2014-11-20 22:11:20 -05:00
jacob1
c9cc2a1a6b more accurate elementCount (part_change_type, pasting stamps, lua), prevent having multiple STKM / SPWN even more 2014-11-20 21:51:45 -05:00