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

874 Commits

Author SHA1 Message Date
Simon Robertshaw
1a17e35c6f Change checking back to ctype for Aray condition 2011-06-25 16:06:17 +01:00
jacksonmj
34d76f8680 Check photon map in Lua functions, and allow any ctype 
Also add some extra checks on ctype in the rest of the game
 2011-06-25 15:59:30 +01:00
jacksonmj
c18009dd9c Check particle exists in tpt.set_property, and sdl_scale mouse coords for Lua step 2011-06-25 15:52:52 +01:00
jacksonmj
36e2a07a5b Visual Studio fixes 2011-06-25 15:52:24 +01:00
jacksonmj
04b3eb11fd Fixes for high life stickman 2011-06-25 15:52:11 +01:00
jacksonmj
9b83bf27a8 Use malloc in parse_save to avoid stack overflow 
918 KiB arrays should not be allocated on the stack...
 2011-06-25 15:52:02 +01:00
jacksonmj
2f594c6bf1 Fix issues with local saving when using scale:2 2011-06-25 15:51:46 +01:00
jacksonmj
4043dba74c Small fixes for liquids in radial/Newtonian gravity 2011-06-25 15:51:38 +01:00
jacksonmj
636b1db4d2 Better liquids movement in radial/Newtonian gravity 2011-06-25 15:51:07 +01:00
jacksonmj
f417d7a4df Include ambient heat in undo 2011-06-25 15:50:59 +01:00
jacksonmj
e67ec08052 Fix fast photons reflecting through obstacles 2011-06-25 15:50:51 +01:00
jacksonmj
9d325dbb7c Fix walls for SING explosions 2011-06-25 15:50:41 +01:00
jacksonmj
fb79865186 Fix gravmap build up during repeated frame stepping 2011-06-25 15:50:32 +01:00
jacksonmj
ad99287f8a Pixel format conversion 2011-06-25 15:50:21 +01:00
jacksonmj
dbf6dcd35b Decor brush shape, and fix big thumb not changing when page changed 2011-06-25 15:50:14 +01:00
jacksonmj
a054a784af Fix soap stamp crashes, and fix stkm head colour 2011-06-25 15:50:07 +01:00
ief015
be79233101 added functions to iterate through all particles 
+ tpt.start_getPartIndex() --starts the iteration
+ bool tpt.next_getPartIndex() --increases the iteration, returns true if there are more particles to iterate through
+ int tpt.getPartIndex() --get the current iteration value
 2011-06-25 01:32:54 -04:00
Simon Robertshaw
c1f4f0481c Fix save_filename crash 2011-06-15 13:47:21 +01:00
Simon Robertshaw
8f97f6c5c7 Revert "Heat simulation improvement." 
This reverts commit 5e43bb0510.
 2011-06-15 13:11:29 +01:00
Simon Robertshaw
daa67b13bd Revert "Prevent photons stealing heat energy" 
This reverts commit aac8898f42.
 2011-06-15 13:10:45 +01:00
Simon Robertshaw
aac8898f42 Prevent photons stealing heat energy 2011-06-14 18:41:01 +01:00
savask
5e43bb0510 Heat simulation improvement. 2011-06-14 17:13:25 +01:00
Simon Robertshaw
304a2fa819 Revert "Better heat treatment." 
This reverts commit 37df2abe90731f2da814a4463f406b0afe9308f9.
 2011-06-14 17:11:24 +01:00
Simon Robertshaw
4fcaadd565 Make aheat in HEAT view less intense 2011-06-14 17:09:36 +01:00
savask
0fbc55dfe8 Better heat treatment. 2011-06-14 16:50:04 +01:00
Simon Robertshaw
464d36d910 Fix small visual issues and crash when folder doesn't exist 2011-06-14 16:23:11 +01:00
Simon Robertshaw
307fff2e3d Fix sim-options icon 2011-06-14 15:15:12 +01:00
Simon Robertshaw
2dd04b917d Add access to the local saving features 2011-06-14 15:13:27 +01:00
Simon Robertshaw
14abcf5fc2 Local saving UI 2011-06-13 23:24:20 +01:00
Simon Robertshaw
e10fbad812 Local save loading - Fix screen buffer issues and scrolling 2011-06-13 17:10:41 +01:00
Simon Robertshaw
8713587e70 Local save loading (WIP) 2011-06-12 22:56:38 +01:00
jacksonmj
93316a9f1d Fix a load of memory leaks 
Also fix some compiler warnings (missing headers, wrong pointer type for
modf, etc) and move variable declarations for Visual Studio.
 2011-06-11 13:00:42 +01:00
Simon Robertshaw
7ae52660f5 Heat advection, currently doesn't obey the whole conservation of energy law 2011-06-10 17:34:47 +01:00
Simon Robertshaw
33b3355192 A-Heat toggle for Simulation options 2011-06-09 23:22:23 +01:00
Simon Robertshaw
1f7106acb1 Gravity zoning 2011-06-09 22:35:00 +01:00
Simon Robertshaw
1effdb052a Image for server saving 2011-06-09 17:53:41 +01:00
jacksonmj
74f613962e Fix typo in previous commit 2011-06-09 23:01:20 +08:00
jacksonmj
7c4135be6b Fix resample_img using array indices larger than src image size 
E.g. resampling to 204x128 from 153x96
Src is 14688 pixels, calculation for pixel location 203,127 accesses
array indices 14688, 14687, 14841, 14840
 2011-06-09 23:01:19 +08:00
Simon Robertshaw
09a3670d64 Clean up signs when reading 2011-06-08 18:09:03 +01:00
Simon Robertshaw
3ea25c83b7 message_box and input for Lua API, also autorun.lua 2011-06-08 16:30:36 +01:00
Simon Robertshaw
345de25641 Fix crash where source and destination scale where the same 2011-06-08 13:45:21 +01:00
Simon Robertshaw
b5c9d86fbe Less blurry thumbnail scaling 2011-06-08 13:30:39 +01:00
jacksonmj
b5856bfa47 console_error now optional for console_parse_type 
Prevents lua step functions from clearing console_error in calls to
console_parse_type, hence preventing luacon_eval errors from being shown
 2011-06-08 12:48:44 +01:00
jacksonmj
b3e0085606 Make step function registration work properly 2011-06-08 12:48:28 +01:00
jacksonmj
1144e3e2d7 Create mercury with tmp value 2011-06-08 12:48:18 +01:00
jacksonmj
22b3ae9275 Fix tpt.get_name and limit tpt.log message length 2011-06-08 12:47:46 +01:00
jacksonmj
e182e7422c Loads of error messages for lua, and hopefully fix lua stack overflow 
Also fix game exiting when an error occurs in a step function.

Returning -1 seems to prevent lua from restoring the stack to the
state it was in before the C function call - see bottom of
luaD_precall() in lua source (ldo.c)
 2011-06-08 12:47:19 +01:00
jacksonmj
43a4544a13 Fix favourites remove button 2011-06-08 12:47:09 +01:00
jacksonmj
2ddb24d5b0 Fix WL_DESTROYALL for fast particles; and no H2 ignition from SPRK 
H2 igniting from spark causes too many problems for electrolysis
 2011-06-08 12:47:03 +01:00
savask
54aa148325 Bubbles now don't pop because of gases. 2011-06-04 19:14:26 +01:00
savask
7f245483a2 Some fixes for stick mans. 2011-06-04 19:12:21 +01:00
savask
e42e7d019e Some work on frozen bubbles. 2011-06-05 01:09:02 +08:00
savask
a48e477fca Moved detach(i) function to powder.c, made soap display connections when 
it's double-joined, made portal in detach soap before teleportating
(works strangely)
 2011-06-05 01:09:02 +08:00
Simon Robertshaw
fcb67622ff Added the ability to use legacy commands (prepend with a \!) 2011-06-04 14:43:18 +01:00
Simon Robertshaw
97cc3488eb Mercury 2011-06-04 14:05:22 +01:00
Simon Robertshaw
8a5e566b77 Stairstepping for downscaling 2011-06-04 12:37:24 +01:00
Simon Robertshaw
b850abe347 Fix setting of temp, x and y particle properties 2011-06-04 12:10:14 +01:00
Simon Robertshaw
41d8e316cd Use bilinear interpolation for everything 2011-06-03 23:54:08 +01:00
Simon Robertshaw
45e91c15b2 Bilinear interpolation for resampling 2011-06-03 23:36:26 +01:00
Simon Robertshaw
417a57b57a Fix semi-large thumbnails 2011-06-03 22:35:57 +01:00
Simon Robertshaw
b32683e99c Favourites interface improvements 2011-06-03 18:54:25 +01:00
Simon Robertshaw
3f072d9bc3 Better step function registration 2011-06-03 13:58:48 +01:00
Cracker64
e3ef7f05f0 some more deco editor changes. Right click deletes decoration again. 2011-06-02 20:24:02 +01:00
jacksonmj
469de0cae0 Fix air-particle heat transfer 
Heat transfer rate is proportional to temperature difference.

Previously, the code caused the temperature change to be proportional to
absolute temperature.
 2011-06-02 20:19:46 +01:00
jacksonmj
744854ef36 Speed up update_PIPE 
By making it call rand() once instead of 6 times.
 2011-06-02 20:19:28 +01:00
jacksonmj
099ab10a37 Walls no longer limit fast particles to 2 pixels per frame 2011-06-02 20:19:18 +01:00
jacksonmj
bc44af6a0b INVS should leave photons alone when under pressure 2011-06-02 20:19:10 +01:00
Simon Robertshaw
289f4e4e4e Change console info 2011-06-02 20:16:43 +01:00
Simon Robertshaw
a7330b9b26 tpt.set_property implementation 2011-06-02 18:49:31 +01:00
Simon Robertshaw
c003fee63e Ambient heat (disabled by default) 2011-06-01 20:18:19 +01:00
Simon Robertshaw
3d600c6955 Add gravity field manipulation to Lua api, move gravity processing to after the particle update (Means a delay of 1 frame, but we get the ability to manipulate the field with Lua) 2011-06-01 12:16:33 +01:00
Simon Robertshaw
2c8c4bc567 Pass mouse coordinates (mousex, mousey, mouseb, mousebq) and Lua click handling 2011-05-31 18:38:13 +01:00
Simon Robertshaw
2327d9678d implement create and delete functions 2011-05-31 17:07:38 +01:00
Simon Robertshaw
03a048afe5 Add calm blue text colour, buffer overflow fix for richtext 2011-05-31 00:33:47 +01:00
Simon Robertshaw
7a875dd846 Fix buffer overflow with huge error message 2011-05-31 00:05:01 +01:00
Simon Robertshaw
b0659e3dd1 Step code registration, just an example at the moment 2011-05-30 20:11:34 +01:00
Simon Robertshaw
d5f1a4cfd0 Many methods for Lua console 2011-05-30 19:44:17 +01:00
Simon Robertshaw
cad644824d Defaults for tpt.drawtext method 2011-05-30 18:25:02 +01:00
Simon Robertshaw
d8051926c8 More descriptive error messages for lua console 2011-05-30 18:15:56 +01:00
Simon Robertshaw
65252aa002 drawtext for Lua 2011-05-30 16:45:39 +01:00
Simon Robertshaw
79a27c2c90 Basics for Lua 2011-05-30 16:22:39 +01:00
Simon Robertshaw
5dcc3dbb44 Rich text syntax 
TODO: Link hovering
 2011-05-29 17:00:31 +01:00
Simon Robertshaw
e35440fe59 MOTD on search page 2011-05-29 14:30:22 +01:00
jacksonmj
4fd97b93b4 Large speed improvement for QRTZ 
Also prevent growing when sparked.
 2011-05-29 13:38:53 +01:00
jacksonmj
7750cf8ccd Improve decoration in blob view, exclude from life and heat view 2011-05-29 13:38:39 +01:00
jacksonmj
f603e33e74 Small speed improvement to eval_move 
Warning: may be buggy, test thoroughly.
 2011-05-29 13:36:11 +01:00
jacksonmj
5e414e64dc Fix WIND decoration, and reset dcolour in create_part 2011-05-29 13:35:00 +01:00
jacksonmj
a2c171fbf9 Remove remaining references to old decorations buffer 2011-05-29 13:34:50 +01:00
jacksonmj
6a2f357efd Revert "Pass decorations to saving functions (doesn't actually save yet)" 
This reverts commit 7fe99f3210.

Conflicts:

	src/main.c
 2011-05-29 13:34:37 +01:00
Simon Robertshaw
a40d1dc121 Decorations saving 2011-05-28 20:37:26 +01:00
Simon Robertshaw
577ad4eb47 Gravity state now saved 2011-05-28 18:54:12 +01:00
Simon Robertshaw
232595c209 Fix image decompression 2011-05-28 18:15:05 +01:00
Simon Robertshaw
2795970639 Some debug info for image decoding 2011-05-28 18:05:05 +01:00
Simon Robertshaw
4c4b457cab Full thumbnails for open_ui 2011-05-28 17:16:12 +01:00
Simon Robertshaw
95e51bc7f4 Render uses resample_img 2011-05-28 15:29:33 +01:00
Simon Robertshaw
edc6339369 Render changes 2011-05-28 14:57:07 +01:00
Simon Robertshaw
380a45a4c9 Image resampling for thumbnails 2011-05-28 14:19:01 +01:00
Simon Robertshaw
abb0ceb981 Use PTi for thumbnails in game browser 
TODO: Better scaling/resampling
 2011-05-28 13:54:23 +01:00
Simon Robertshaw
2c7b8a6902 Fix renderer, add image decode/code methods 2011-05-28 13:49:07 +01:00
jacksonmj
ab7cd2e5f6 Skip some calls to do_move for liquids 
No liquid can occupy the same space as itself unless in E-Hole
 2011-05-28 18:51:57 +08:00
jacksonmj
420f8e7442 Make NBHL/NWHL eat things in the same way as BHOL/WHOL 
Also make ANAR move opposite to Newtonian gravity
 2011-05-28 18:51:57 +08:00
jacksonmj
6e9cbfdb4a Fix STKM always going through walls 
Now behaves as normal, i.e. only occasionally goes through walls.

Walls which completely block all particles are in the pmap with type
0xFF. ptypes[] doesn't go up to 0xFF, so ptypes[0xFF].state will not
necessarily result in an answer that gives correct behaviour for walls.
 2011-05-28 18:51:57 +08:00
Simon Robertshaw
5919cefa85 Decorations are per particle TODO: remove references to the decorations buffer 2011-05-27 14:44:56 +01:00
Simon Robertshaw
7bf0ac10f6 Add some potential HTTP response codes 2011-05-24 19:57:08 +01:00
Simon Robertshaw
2a1e51abff temp fix for linux compilation 2011-05-24 15:11:25 +01:00
Simon Robertshaw
a52344f399 Decorations improvements 2011-05-24 15:01:18 +01:00
Simon Robertshaw
2d9e0b75e4 jacksonmj's decorations commit 2011-05-24 14:57:46 +01:00
Simon Robertshaw
453c69d39a Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy 2011-05-24 14:55:29 +01:00
Simon Robertshaw
eafcdf8ec9 Improve error handling on display initialisation 2011-05-24 14:54:14 +01:00
jacksonmj
ee39c06152 Decorations toggle and brush size keys 2011-05-24 21:49:08 +08:00
jacksonmj
fc4de9640c Fix sim options description, GOO and DEUT 2011-05-24 21:49:08 +08:00
Simon Robertshaw
dadac37264 Move Diamond into solids menu, add gravity elements 2011-05-20 13:00:34 +01:00
Simon Robertshaw
c932552aed Message notifications on login 2011-05-20 12:42:36 +01:00
Simon Robertshaw
1622974c0a Fix message notifications for non-elevated users 2011-05-19 21:41:13 +01:00
jacksonmj
603844f97f Fix DEUT explosion 2011-05-19 22:53:24 +08:00
jacksonmj
7482e4d071 Small fix for liquid and powder movement 2011-05-19 22:53:23 +08:00
jacksonmj
68c4d6d621 Make sure WIND can't be created 
Revert this if the element number is reused for something useful
 2011-05-19 22:53:23 +08:00
jacksonmj
e4b03fb2e2 Photons and neutrons go through portal instead of reflecting 2011-05-19 22:53:23 +08:00
Simon Robertshaw
af68469f6a pthread Win32 static linking 2011-05-19 15:32:50 +01:00
Simon Robertshaw
3ff800ec9a Message notification changes 2011-05-19 08:08:59 +01:00
Simon Robertshaw
9d70d60ee9 New message notification on session check TODO: Clickable link to conversations on website 2011-05-16 12:46:08 +01:00
Simon Robertshaw
1ddff1ad3b Runtime fullscreen toggle TODO: Fix bug that prevents from closing the window after a fullscreen toggle 2011-05-15 20:40:08 +01:00
Simon Robertshaw
d8e7c82f1c Fix n-gravity toggle 2011-05-15 19:45:45 +01:00
Cracker64
9d20d6af82 Decoration has a color menu. GoL uses less memory(17MB less), and probably a bit faster. 2011-05-14 13:46:10 +01:00
jacksonmj
e675fb3cc1 Fix crash with negative lava ctype 
E.g. "set type prti lava"
 2011-05-14 13:44:44 +01:00
jacksonmj
203c3a0151 Translate invisible particles to decorated diamond when loading 2011-05-14 13:44:22 +01:00
jacksonmj
7fe99f3210 Pass decorations to saving functions (doesn't actually save yet) 2011-05-14 13:44:02 +01:00
jacksonmj
cbfc73d8d6 Turn WIND into a tool 2011-05-14 13:43:51 +01:00
jacksonmj
26dbf70709 Fix overlapping particles 2011-05-14 13:39:40 +01:00
jacksonmj
882a839205 Fix high speed photons when reflecting near glass 2011-05-14 13:39:14 +01:00
Simon Robertshaw
fa54c005b2 Use properties for life decrement/kill 2011-05-14 13:38:52 +01:00
Simon Robertshaw
73f2f9f57f fix neutron cloning 2011-05-14 13:34:06 +01:00
jacksonmj
c23124e0d7 Shrink draw_tool_xy 2011-05-14 13:28:24 +01:00
Simon Robertshaw
16f014b06a Move wall drawing to graphics.c 2011-05-14 13:28:02 +01:00
Simon Robertshaw
d0f236d6b9 Condition variable instead of busy wait 2011-05-14 13:21:44 +01:00
Simon Robertshaw
33eb485c9f Revert "-a" 
This reverts commit 550d270af2.
 2011-05-14 13:09:46 +01:00
Simon Robertshaw
550d270af2 -a 2011-05-14 13:02:36 +01:00
Simon Robertshaw
3196690b03 Runtime scale switching 2011-05-13 10:44:39 +01:00
Simon Robertshaw
351565c6e2 Fix some thread sync and gravity sync issues 2011-05-12 18:45:14 +01:00
Simon Robertshaw
ee962dc8bb Newtonian gravity toggle, disabled by default 2011-05-12 18:04:29 +01:00
Cracker64
59bd280fad ANAR changes, WHOL absorbs ANAR and gets colder. ANAR burns with CFLM strangely. 2011-05-05 20:38:30 +01:00
jacksonmj
b5a334c2af Improve piling of powders 2011-05-05 20:36:14 +01:00
jacksonmj
59d9071e87 Make damp sponge much less flammable 
Also make evaporation cool the sponge better
 2011-05-05 20:35:17 +01:00
jacksonmj
0aa4970b33 Remove some unnecessary checks 2011-05-05 20:35:08 +01:00
jacksonmj
892a2b11c7 Make middle click work with photon map 2011-05-05 20:34:22 +01:00
jacksonmj
9a3836879e H2 burns from spark, lava, plasma; O2 burns from plasma 2011-05-05 20:34:05 +01:00
jacksonmj
a7b5718c6a Fixes for previous commit 
Previous commit caused buggy movement in walls
 2011-05-05 20:33:42 +01:00
jacksonmj
ddaed2ad69 Slight speed improvement for liquids and powders 2011-05-05 20:33:09 +01:00
jacksonmj
7543a3d05e Fix plut lava 
type already set to ctype and ctype already cleared, whoops.
 2011-05-05 20:31:46 +01:00
savask
f0c5960b56 Some work on bubbles. Added "bubble x,y" command to console. 
Also made them save like regular soap.
 2011-05-05 20:24:42 +01:00