Commit Graph

390 Commits

Author SHA1 Message Date
Simon Robertshaw
25d872ec48 MacOS X targets for Scons, Fix some inlines for clang 2012-09-25 17:53:48 +01:00
Simon Robertshaw
3b2f4d59fc Better fire rendering for saves 2012-09-14 23:53:58 +01:00
Simon Robertshaw
5b9032fb3f Correct initialisation of FIGH 2012-09-14 22:23:35 +01:00
Simon Robertshaw
685be24ffa Remove testing particle from repo 2012-09-13 23:01:30 +01:00
Simon Robertshaw
3e0fcc904e Disable JIT for now 2012-09-13 11:01:09 +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
2dcdca2761 fix spark color in nothing mode 2012-09-07 00:37:53 +01:00
jacob1
24b4b0b187 Fix bugs with energy particles in PIPE 2012-09-07 00:36:02 +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
322d224fa7 Get/Set single element properties 2012-08-30 17:09:27 +01:00
Simon Robertshaw
a9fba97c36 Fix streamline placement 2012-08-30 01:50:18 +01:00
Simon Robertshaw
58dc2559aa Implement retrieval of element properties 2012-08-29 22:04:07 +01:00
Simon Robertshaw
92f3ad5814 Black decorations only in thumbnails 2012-08-28 15:53:07 +01:00
Simon Robertshaw
1fb544815f Correct PHOT colour during fusion 2012-08-28 15:13:20 +01:00
Simon Robertshaw
14c0ea59a9 cold phot doesn't burn things 2012-08-28 15:09:32 +01:00
Simon Robertshaw
05e32f1698 Fix things melting with heat sim off 2012-08-28 15:08:11 +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
29619e9ebf WOOD and PLNT turn grey when hot, bluish when cold 2012-08-28 13:19:34 +01:00
Simon Robertshaw
99b2d8d67d Limit SPNG saturation and reduce absorbtion rate for GEL and SPNG with some elements 2012-08-28 12:48:50 +01:00
Simon Robertshaw
5ded005b0c Correct proportions of CO2 and WATR when GEL/SPNG is absorbing BUBW 2012-08-28 12:40:18 +01:00
Simon Robertshaw
91ec4d1125 GEL and SPNG absorb water from more elements and leave behind what the water was mixed width 2012-08-28 12:38:18 +01:00
Simon Robertshaw
86fc8e1eb3 TPT: Prevent Acid from eating broken glass 2012-08-28 12:28:16 +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
ebc4116675 Disable decorations when rendering saves 2012-08-26 16:37: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
1987efd6e5 Revert "HYGN now combusts and fuses properly"
This reverts commit ede6876a82.
2012-08-25 16:33:12 +01:00
Simon Robertshaw
9b10f0c390 Revert "final fusion fixes"
This reverts commit add4226f31.
2012-08-25 16:32:51 +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
ae3c9ddf39 Don't you just hate those fencepost errors... Stop going out of bounds when traversing the X axis with gravity mask. 2012-08-24 20:36:23 +01:00
Simon Robertshaw
822539bcdb More efficient floodfill function for gravity walls, no need for larger stacks with 64bit builds 2012-08-24 18:22:02 +01:00
Simon Robertshaw
fb6f36907f PPIP glowing brick in fire mode 2012-08-21 14:58:23 +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
Bryan Hoyle
add4226f31 final fusion fixes 2012-08-20 17:46:51 -04:00
Bryan Hoyle
ede6876a82 HYGN now combusts and fuses properly 2012-08-20 16:59:19 -04:00
Simon Robertshaw
51a0fb2d45 TPT: Prevent CONV from destroying diamond 2012-08-20 16:54:56 +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
fb02d57aca TPT: Fix salt/water proportions when dissolving into DSTW as well 2012-08-20 14:08:27 +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
3d140d310e Merge branch 'master' of github.com:FacialTurd/PowderToypp 2012-08-19 11:30:57 +01:00
Simon Robertshaw
7ae2369dda Make ngrav negative, fixes #133 2012-08-19 11:30:44 +01: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
f19c7f62c7 Air invert and grid mode switching 2012-08-16 12:15:29 +01:00
Simon Robertshaw
a7711668b7 Strings.h for strcasecmp in Simulation 2012-08-14 18:06:18 +01:00
Simon Robertshaw
b06f7f5b6d Air and heat tool limits, fixes #112 2012-08-14 16:29:07 +01:00
Simon Robertshaw
074dcd0b42 Precompile some headers. Fix sconscript to prevent recompiling everything 2012-08-13 15:43:57 +01:00
Bryan Hoyle
ae469e8e02 oops, fixed a bad piece of code I added 2012-08-12 19:10:01 -04:00
Bryan Hoyle
1dc6c7cfef Opengl fixes 2012-08-12 17:40:44 -04:00
Simon Robertshaw
8ca27520a4 Use forward declarations more to avoid excessive includes 2012-08-12 22:32:57 +01:00
Simon Robertshaw
2f76c2374d TPT: Give menu color to elements without one (stickmen, TRON, and WARP) 2012-08-11 11:57:21 +01:00
Simon Robertshaw
a6b3674f22 Fix PIPE, fixes #92 2012-08-10 22:30:19 +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
a8dcc7a070 Started work on save as current name 2012-08-06 22:24:10 +01:00
Simon Robertshaw
662640c96c Fix previous merge with SOAP.cpp that created a bug in SOAP. add debug lines for PRTI, PRTO, WIFI and lines for SOAP. 2012-08-06 16:14:08 +01:00
Simon Robertshaw
d46a72aa3b Font glyphs for decorations and element search 2012-08-05 22:02:12 +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
3030d67516 Fan wall line tool, fixes #61 2012-08-05 16:14:33 +01:00
Simon Robertshaw
50103aa074 Fix some of the flood fill methods 2012-08-05 16:11:43 +01:00
Simon Robertshaw
ed270d8dbf Draw gravity zones when using grav wall 2012-08-05 15:26:17 +01:00
Simon Robertshaw
351ce1525f Update gravity walls, fixes issue #52 2012-08-05 14:03:54 +01:00
Simon Robertshaw
0558322709 Add icons for erase, improve icons for certain walls, fix issue #45 2012-08-04 15:26:55 +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
ntoskrnl
baf07e470e Build fixes for FreeBSD 2012-08-04 11:32:48 +01:00
Simon Robertshaw
11d2b0eb3c Correct VAC and EXOT colours, issue #49 2012-08-03 18:04:18 +01:00
Simon Robertshaw
347c382e99 Allow PROP to set types from element name, fixes issue #48 2012-08-03 12:52:07 +01:00
Simon Robertshaw
24006ee44a Grav colour, addresses rest of #41, colour will vary from original TPT 2012-08-03 01:40:13 +01:00
Simon Robertshaw
4233bc743c Use HFLM colour data, addresses some of issue #41 2012-08-03 01:18:39 +01:00
ntoskrnl
f94fabd999 Rename WIN32 preprocessor definition to WIN 2012-08-02 15:21:16 +01:00
Simon Robertshaw
90ad1fd856 Restart N. Grav when needed (somewhat effects issue #31) and fix shitty logic when setting paused state on loading save (Fixes issue #34) 2012-07-29 12:29:19 +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
0b3724215e Remove blockair update in Air.cpp function to fix TTAN - solves issue #30 2012-07-29 01:40:42 +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
5befe5c25f Local file browser + some more interesting things like Progress bar UI component 2012-07-27 20:06:17 +01:00
Simon Robertshaw
8c7755d5d2 TPT: Now stickmen can shoot plasma. dc01f09f0e 2012-07-25 20:04:47 +01:00
Simon Robertshaw
79727c9193 Fix for previous commits 2012-07-25 19:47:27 +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
a5d6c56f8c TPT: Salt should only melt ice that is above saltwater freezing temperature 3e1d3cd5a6 2012-07-25 19:33:40 +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
76070f99e0 TPT: This should fix PLNT lag just a little bit... (mostly after shooting though NEUT) 5f3c10a684 2012-07-25 18:46:15 +01:00
Simon Robertshaw
fad2311c36 TPT: C5 should not explode when touching cold INSL a925eea52c 2012-07-25 18:44:30 +01:00
Simon Robertshaw
67d449df3d Fix typo in EMBR gravity 2012-07-25 18:43:19 +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
1e5eba3583 TPT: Make VOID and BHOL eat stickmen again 1f4f50682c 2012-07-25 18:27:08 +01:00
Simon Robertshaw
41cbd69ac8 TPT: Use atan2 for LIGH angle calculations 966f1dcc23 2012-07-25 18:25:37 +01:00
Simon Robertshaw
de4fe1a38e TPT: Reduce rate of lightning creation by clone 167740e839 2012-07-25 18:23:07 +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
9edf65fb3f TPT: FIRW: less advection, and don't go faster when multiple fire particle... 9988dc17aa 2012-07-25 18:03:43 +01:00
Simon Robertshaw
38e2eec808 TPT: Completely remove SING formation from fusion 81771d8672 2012-07-25 18:02:38 +01:00
Simon Robertshaw
0b77f1b2ed TPT: Only create one NBLE particle for each fusing H2 particle 29aab750e5 2012-07-25 18:01:58 +01:00
Simon Robertshaw
971fbc71f9 TPT: fix compression during fusion 287822229f 2012-07-25 18:01:15 +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
0afecb5b77 TPT: Replace all explosion sparks with new element (EMBR) 1d5b081942 2012-07-25 17:11:36 +01:00
Simon Robertshaw
57c356e495 TPT: Make ELEC+water form H2 and O2 in the correct proportions 9b2c2a78a6 2012-07-25 15:56:42 +01:00
Simon Robertshaw
6dc7eaf43e TPT: Prevent stacking from ELEC+NEUT, ELEC+water, and CO2 from BUBW ae5470ca78 2012-07-25 15:55:42 +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
2214ab4eb0 TPT: Correct freezing temperature for SLTW (-21.1 C) 06d2d5267e 2012-07-25 15:36:40 +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
32d9b87f66 Correct Stickman appearance 2012-07-25 14:24:03 +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
f7d8556965 Icons for menu items 2012-07-21 18:43:46 +01:00
Simon Robertshaw
c2873180e2 GOL loads gol colours for use 2012-07-19 17:05:01 +01:00
Simon Robertshaw
2b4ec99894 Use two functions for renderer drawing instead of several, fix alignment with Zoom Window border 2012-07-19 16:37:56 +01:00
Simon Robertshaw
80044bb0f0 Renderer Presets and default graphics function 2012-07-18 17:22:35 +01:00
Simon Robertshaw
adc9cc0816 Move graphics into seperate folder 2012-07-06 16:06:26 +01:00
Simon Robertshaw
694a6ed4f2 Ammend to previous commit - the issue was not with smaller saves, but the accumulation of rendered particles on the framebuffer - fixed by clearing the fbo and pbo before rendering 2012-06-25 22:34:04 +01:00
Simon Robertshaw
2ffb45581f SaveRenderer working on OpenGL - doesn't seem to work with small saves though 2012-06-25 22:26:53 +01:00
Simon Robertshaw
dacb774ae0 Resizable window when using OpenGL interface 2012-06-25 16:10:40 +01:00
Simon Robertshaw
ab8f382acc Sign tool can now edit existing signs 2012-06-25 13:57:23 +01:00
Simon Robertshaw
04b007b36f Create FFT plan on demand instead of at startup on the main thread 2012-06-25 12:19:26 +01:00
Simon Robertshaw
550f6e28e0 Stage 1 of update process completed 2012-06-21 15:49:32 +01:00
Bryan Hoyle
3b29a74767 fixes to code and a option for opengl building for release 2012-06-20 15:05:25 -04:00
Bryan Hoyle
c775126272 Merging 2012-06-20 14:45:06 -04:00
Simon Robertshaw
09758b9152 SaveRenderer returns a placeholder thumbnail in case of OpenGL 2012-06-20 19:43:03 +01:00
Bryan Hoyle
e5e638448c remove some debugging 2012-06-20 14:42:42 -04:00
Bryan Hoyle
b35255b722 Renders an X in place of save icons, atm. 2012-06-20 14:25:41 -04:00
Bryan Hoyle
c9f837f21d Opengl can open saves now, just need to get it to render accurately later 2012-06-20 14:23:22 -04: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
4bda62b68c TPT: Make ambient heat convection work a bit better 2012-06-13 01:40:13 +01:00