Commit Graph

206 Commits

Author SHA1 Message Date
jacob1
2a4298047c Fix smudge issue 2012-09-25 22:57:11 +01:00
Simon Robertshaw
5b9032fb3f Correct initialisation of FIGH 2012-09-14 22:23:35 +01:00
jacob1
5a91b83875 revert changing the lua/sdl includes and min/max changes 2012-09-07 00:53:29 +01:00
jacob1
f8f70a3f77 Visual studio compatibility
This removes some inlines when using visual studio to compile, uisng TPT_NO_INLINE. It also fixes many other problems visual studio has with the code
2012-09-07 00:52:56 +01:00
jacob1
1391de2e3a Wall names in HUD
Conflicts:

	src/game/GameView.cpp
2012-09-07 00:35:33 +01:00
Simon Robertshaw
b0158e2f60 Changes to Smudge and blending modes (make them a little slower and easier to handle) 2012-09-05 21:49:34 +01:00
Simon Robertshaw
0a67e560f4 Fix Simulation Tool brush issue (misalignment/didn't work with small brushes). Fixes #167 2012-09-01 17:17:15 +01:00
Simon Robertshaw
a9fba97c36 Fix streamline placement 2012-08-30 01:50:18 +01:00
Simon Robertshaw
4263e3aab7 DTEC, generates a spark when something with it's ctype is nearby 2012-08-28 14:17:01 +01:00
Simon Robertshaw
072cfe67aa Missing part of TPT commit 04a09d997, for TTAN, nt and surround_space is now from 0 to 8 2012-08-27 15:11:45 +01:00
Simon Robertshaw
dd2fc64793 Fix bug in history restoring where the lastActiveIndex is not updated leading to incomplete restoring 2012-08-27 13:33:15 +01:00
Simon Robertshaw
0ca680f4c8 Enable decorations in renderer for local save items, disable for server save previews. 2012-08-27 13:32:17 +01:00
Simon Robertshaw
5c293ba9bf Fix messed up revert 2012-08-25 16:41:34 +01:00
Simon Robertshaw
59a78621d9 Complete "Consistent proportions of WATR and SALT in SLTW" after REALISTIC revert 2012-08-25 16:36:01 +01:00
Simon Robertshaw
082072a05e OPS: Fix byte order when unpacking 4 byte tmp fields 2012-08-25 16:29:27 +01:00
Simon Robertshaw
b6736f967e Add EMP flash, fixes #137 2012-08-21 13:00:31 +01:00
Simon Robertshaw
4b8ebe4abd Air heat simulation now knows about gravity mode. fixes #142 2012-08-21 12:26:39 +01:00
Simon Robertshaw
b318c3721a TPT: Powered pipe, based on jacob1's commits 2012-08-20 16:48:03 +01:00
Simon Robertshaw
9c599a7b9f TPT: fix enegery particles going into PIPE 2012-08-20 14:26:08 +01:00
Simon Robertshaw
29283b038c TPT: Consistent proportions of WATR and SALT in SLTW (1 SALT + 3 WATR = 4 SLTW) 2012-08-20 13:55:11 +01:00
Simon Robertshaw
7fc8d5f388 Add missing legacy update function 2012-08-20 13:41:03 +01:00
Savely Skresanov
d6fe7fa2c8 Basic realistic heat and latent heat support. 2012-08-19 20:06:10 +07:00
Simon Robertshaw
0092229132 Don't delete Simulation::Elements now that it's not runtime allocated 2012-08-19 00:49:24 +01:00
Simon Robertshaw
63da7a4afe Initialise stickman legs correctly 2012-08-18 17:31:31 +01:00
Simon Robertshaw
ce3bb6f755 Element slots default to disabled 2012-08-18 17:19:39 +01:00
Simon Robertshaw
9b2433f912 Fix typo 2012-08-18 17:13:13 +01:00
Simon Robertshaw
7018e46fac Remove disabled elements when simulating. Fix crash when kill_part is run on elements with invalid types 2012-08-18 17:08:24 +01:00
Simon Robertshaw
edad8f46af Undo/Snapshots, fixes #118 2012-08-16 22:03:40 +01:00
Simon Robertshaw
a7711668b7 Strings.h for strcasecmp in Simulation 2012-08-14 18:06:18 +01:00
Simon Robertshaw
074dcd0b42 Precompile some headers. Fix sconscript to prevent recompiling everything 2012-08-13 15:43:57 +01:00
Simon Robertshaw
3499cb3035 Wall brush, fixes #63 2012-08-10 18:59:05 +01:00
Simon Robertshaw
a45ca0363e Tool - Correct box drawing. Finishing touches to tool strength (Fixes #87) 2012-08-10 14:12:56 +01:00
Simon Robertshaw
810ea42f99 Only render gravity lensing if it's enabled, Ctrl and Shift to alter tool strength (Shift = x10, Ctrl = x0.1) 2012-08-10 14:03:23 +01:00
Simon Robertshaw
b01b0e422a HUD verbose sample info with 'd', fixes #71 2012-08-09 21:28:43 +01:00
Simon Robertshaw
9971ea63b7 Slow LIGH creation speed, fixes #86 2012-08-09 21:05:20 +01:00
Simon Robertshaw
4ce22e4e77 Wall Edge option, fixes #70 2012-08-05 18:35:12 +01:00
Simon Robertshaw
30f8049efc Allow 24bits of var for create_part, add tool for tesc. Fixes #72 2012-08-05 16:59:14 +01:00
Simon Robertshaw
50103aa074 Fix some of the flood fill methods 2012-08-05 16:11:43 +01:00
Simon Robertshaw
351ce1525f Update gravity walls, fixes issue #52 2012-08-05 14:03:54 +01:00
Simon Robertshaw
f32cd872ca Set initial stickman spit element in create_part, fixes the rest of #50 2012-08-04 14:38:59 +01:00
Simon Robertshaw
347c382e99 Allow PROP to set types from element name, fixes issue #48 2012-08-03 12:52:07 +01:00
ntoskrnl
f94fabd999 Rename WIN32 preprocessor definition to WIN 2012-08-02 15:21:16 +01:00
Simon Robertshaw
824bde4ceb clear_sim now clears air and gravity maps better, fixes issue #31 2012-07-29 12:18:07 +01:00
Simon Robertshaw
1f914561b2 Better syncing for elementCount, fixes issue #21 2012-07-29 02:07:04 +01:00
Simon Robertshaw
4b1c388995 Update ambient heat when enabled, fixes issue #28 2012-07-28 12:30:41 +01:00
Simon Robertshaw
aa774771a0 Collapse gamesave to save space in memory 2012-07-28 02:23:21 +01:00
Simon Robertshaw
a033fe7e49 TPT: Add ptypes.enabled checks to a few more places 61f39f5464 2012-07-25 19:42:53 +01:00
Simon Robertshaw
f8766201a6 TPT: Optimization for GoL, Added brush size and mouse wheel to lua! e7035233fd 2012-07-25 19:32:36 +01:00
Simon Robertshaw
b9e16d4bc6 TPT: Prevent STKM falling through activated PVOD with a ctype that isn't STKM 637ee194e0 2012-07-25 18:32:10 +01:00
Simon Robertshaw
5337f91736 TPT: Lightning direction affected by Newtonian gravity 3a946efdfd 2012-07-25 18:21:25 +01:00
Simon Robertshaw
55c870c518 TPT: Allow INST to be sparked directly with the brush 8de602d467 2012-07-25 18:15:13 +01:00
Simon Robertshaw
aa156fb933 TPT: Fix infinite loop when flood_INST finds some INST with a non zero lif... 9ee316c3e9 2012-07-25 18:13:09 +01:00
Simon Robertshaw
2135d88644 TPT: Reset particle flags in create_part 135e91b84d 2012-07-25 17:52:26 +01:00
Simon Robertshaw
799954f383 TPT: Allow stickman head to go through everything 95ca29cc64 2012-07-25 17:51:37 +01:00
Simon Robertshaw
7859cc839c TPT: Prevent STKM floating in gases 31a61d0888 2012-07-25 17:45:30 +01:00
Simon Robertshaw
e36bc8e4ae TPT: Gravity modes and Newtonian gravity for fireworks 31ce22f122 2012-07-25 17:44:29 +01:00
Simon Robertshaw
811c2cb26b TPT: Use eval_move(PT_FIGH, ...) when fighters are checking for obstacles 79614a9719 2012-07-25 17:21:13 +01:00
Simon Robertshaw
6585a4640b TPT: Replace all explosion sparks with new element (EMBR) 1d5b081942 2012-07-25 17:12:15 +01:00
Simon Robertshaw
08d1dd06ed TPT: Fix STKM causing stacking and falling through some powders c14704ae49 2012-07-25 15:47:18 +01:00
Simon Robertshaw
2189d298a7 TPT: Move INST flood fill into a separate function 36de2f19f5 2012-07-25 15:32:05 +01:00
Simon Robertshaw
fad383f392 TPT: Update to EXOT that makes it permeable to neutrons as well as electro... a104696620 2012-07-25 15:05:55 +01:00
Simon Robertshaw
d50d45ecff Fix deco smudge tool 2012-07-24 15:56:01 +01:00
Simon Robertshaw
603cf3149d HUD improvements 2012-07-24 14:58:39 +01:00
Simon Robertshaw
e65e222f2c Integer values for prefs, Default decoration colour, clear decoration 2012-07-24 13:03:28 +01:00
Simon Robertshaw
edac8b5481 Free tools 2012-06-18 15:32:15 +01:00
Simon Robertshaw
741392f2c1 Free platent and elements 2012-06-18 15:25:24 +01:00
Simon Robertshaw
f0778c2033 TPT: Prevent THDR from counting towards stacked particle limit 2012-06-13 01:28:33 +01:00
Simon Robertshaw
5f81b70787 TPT: Avoid stacking in INVS and FILT, and fix pressurised INVS graphics 2012-06-13 01:28:00 +01:00
Simon Robertshaw
2aebc294e8 TPT: Run stacking check less often 2012-06-13 01:21:33 +01:00
Simon Robertshaw
a4d156fc6b TPT: Prevent solid particles stacking in E-Hole 2012-06-13 01:06:44 +01:00
Simon Robertshaw
427670682f TPT: EXOT 2012-06-13 00:57:02 +01:00
Simon Robertshaw
c7ec0b76f6 TPT: Fix the bug with not-spawning fighter. 2012-06-12 21:29:24 +01:00
Simon Robertshaw
ef777b92dc TPT: Put ifs into switch in create_part 2012-06-12 21:28:37 +01:00
Simon Robertshaw
db86294e6a TPT: Prevent allocation of particles with type==0, bleep bloop 2012-06-12 20:16:33 +01:00
Simon Robertshaw
9033786e49 TPT: Fix PROP_NEUTPENETRATE, particles weren't being moved into empty space 2012-06-12 20:15:33 +01:00
Simon Robertshaw
f8badc05d4 TPT: Fixed the bug with snow, where it melted without taking it's ctype into account. 2012-06-12 20:13:04 +01:00
Simon Robertshaw
2e1780ce4e TPT: VOID & PVOD can be set to only eat/not eat certain things 2012-06-12 19:59:19 +01:00
Simon Robertshaw
a95ceb4c92 TPT: energy type particles automatically go into photons, not pmap 2012-06-12 19:55:00 +01:00
Simon Robertshaw
dd041d1699 TPT: GPMP activated at draw 2012-06-12 19:29:10 +01:00
Simon Robertshaw
af5c399c24 TPT: Update gravity mask when loading saves 0fb6b85706 2012-06-12 18:48:00 +01:00
Simon Robertshaw
391165409d TPT: New flood_parts function, should fix crashing due to too much recursion a11202313d 2012-06-12 18:41:36 +01:00
Simon Robertshaw
10f51cb586 TPT: Make TTAN block pressure when framestepping 58ea2b2acf 2012-06-12 18:22:25 +01:00
Simon Robertshaw
7c5e74410b TPT: New element: Titanium, absorbs some neutrons, acts as a solid wall to air d7fa0b139e 2012-06-12 18:16:40 +01:00
Simon Robertshaw
50a587813e TPT: Add PROP_NOAMBHEAT to prevent certain elements from being heated by Ambient heat… 8397b6e51a 2012-06-12 17:25:06 +01:00
Simon Robertshaw
f2e1d38b58 TPT: Save soap bubbles 6717f4ff32 2012-06-12 17:06:38 +01:00
Simon Robertshaw
a270acfc54 OPS loading: don't replace existing particles twice, and clear soap c… 2012-06-12 16:30:27 +01:00
Simon Robertshaw
3205df3a21 Saving and loading other flags from GameSave, remove old saveloader 2012-06-11 13:39:39 +01:00
Simon Robertshaw
c408e035fa Preview: Wait for save to load before opening, Simulation: Correct block coords when reading wall data, replace existing particles when placing stamps on top, Game: Clear the simulation when loading a save 2012-06-09 14:54:58 +01:00
Simon Robertshaw
0ee1e1875d Load save data when showing the save preview 2012-06-08 22:04:14 +01:00
Simon Robertshaw
8fae7dbade Saving and loading at position, yuse exceptions for parsing saves 2012-06-06 01:46:13 +01:00
Simon Robertshaw
49dafbfd26 Use a different method for decoding saves with uncompressed object in memory for stamps and clipboard, also allows for transformation (rotation), missing failure states and code for loading it into a Simulation 2012-06-05 20:08:35 +01:00
Simon Robertshaw
bbf7851596 Seperate new/old CreateParts functions 2012-05-15 20:01:20 +01:00
Simon Robertshaw
45563e97e8 Make flood_prop use PropertyType from StructProperty, Property tool works 2012-05-15 00:10:10 +01:00
Simon Robertshaw
4032a0469b Click function for tools that aren't continuous. Debug helper for UI components (Ctrl+Shift D when DEBUG is defined), fix add sign window logic 2012-05-13 17:43:41 +01:00
Simon Robertshaw
724c99102e Stupid git 2012-05-12 22:28:45 +01:00
Simon Robertshaw
c5798c7456 Tools implemented in a similar way to elements 2012-05-12 18:11:20 +01:00
Simon Robertshaw
16d3895e9c Redo Wall IDs 2012-05-12 13:21:04 +01:00
Simon Robertshaw
51b17badf4 A bit of refactoring (elements) 2012-05-07 17:59:50 +01:00
Simon Robertshaw
bb8a3f76e3 OS X compiling working, Make it a bit more friendly with stricter compilers 2012-04-26 13:10:47 +01:00
Simon Robertshaw
96506610b2 Clean out graphics, add openGL graphics in seperate file, change brush to use unsigned char rather than boolean for bitmap/outline 2012-04-21 22:46:37 +01:00