kai/assaultcube-
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,266 Commits 1 Branch 0 Tags
3bdd199ad2ec49e1d02fa0e89967429c69348e8f
Commit Graph
50 Commits
Author SHA1 Message Date
ac-stef 3bdd199ad2 include and translate texture slots during copy&paste 
When blocks of map geometry are copy-pasted between maps (or xmaps), this
commit translates the texture slot numbers between different texture
config sets. Missing textures are assigned a slot in the target map.

When texture slots are added, automapconfig gets enabled.

If the paste gets removed by the undo function, the newly assigned texture
slots will NOT be removed. This is by design.
 2015-06-05 16:00:01 +02:00
ac-stef 685dbb8326 store old state of random generator to restore after a seed() 
The light calculation requires the random generator to be seeded with a
constant - otherwise repeated light recalculations would make the lights
change.

This patch allows the random generator to go back to the state before the
static seed().
 2015-02-08 17:39:14 +01:00
lucasgautheronandac-stef 1f7494200e postlightarea crash fix 
the crash could occur on specific maps such as ac_swamp

amend: fixed the fix (thx BrutalSystem)
 2015-01-18 20:27:12 +01:00
ac-stef 4fdba4fa4a less ugly mapdims 
replaced the mapdims array with a struct with properly identified members

also reduced the calclight postfilter to actually used map areas
 2014-11-12 17:52:44 +01:00
ac-stef 493aefd34b fix: convert xmap path names for windows 
* make sure, unsaved edits only count in editmode (otherwise "watercolour"
  in map configs would already be "edits")

* nicer filenames for backup-xmaps

* catch failed xmap file write access

* unsavededits is now flag (!= 0) and counter - to enable scripts to
  detect "new edits".

new commands:

xmap_delete_backup    deletes the backup xmap

xmap_keep_backup    moves the backup xmap to a regular named spot

xmap_rename    changes the nickname of an xmap
 2014-05-19 12:31:26 +02:00
ac-stef b0649b5ea5 multiple map buffers for map editing: "xmaps" 
An xmap holds everything related to map editing at a certain moment: it is
a map editing snapshot. It contains the name, the header, the geometry,
the entities, the extra headers, the undo/redo data and the cameraposition
from the moment, the snapshot was taken.

Xmaps are held in memory and, if persistentxmaps is set to "1", are saved
at game end and restored at game start.

xmap_list
  lists all xmaps currently in memory

xmap_store <nickname>
  create a snapshot and store it under the given nickname
  (nicknames have to qualify as valid filenames)

xmap_restore <nickname>
  restores the named snapshot. Also creates a backup snapshot of the
  current editing data.

xmap_restore
  restores the last automatic backup snapshot. Automatic snapshots are
  taken, a) before a snapshot is restored, b) before a new map is loaded
  (if there were unsaved edits on the map) and c) when the game ends (if
  there were unsaved edits).

xmap_delete <nickname>
  deletes the named snapshot.

Unsaved edits are flagged in the HUD with an "U" in the lower right
corner of the screen.

The files with the persistent xmaps are stored in mapediting/xmaps. After
they were restored at game start, the files are moved to
mapediting/xmaps/backups. Xmap files are cubescript files.
 2014-05-15 17:34:25 +02:00
ac-stef 5f484a45a5 engine tweak: fixing lighting postfilter 
no longer directional IIR filtering, now it's (mostly) pure FIR
also, huge speedup (for example, ac_iceroad recalcs 80% faster)
 2014-05-15 13:48:31 +02:00
ac-stef 9eceef38df engine tweak: cleaning up calclight 2014-05-15 13:48:31 +02:00
ac-stef 34b99ca713 engine tweak: static seed for random light calculation 
repeated recalcs now produce the same lighting - also, every player
gets to see the same map
 2014-05-15 13:48:31 +02:00
ac-stef b38fd1b57b engine tweak: speeding up blockcopy/blockpaste 
used for dynlight, and that's realtime...
 2014-05-15 13:48:31 +02:00
ac-stef ff8aea940d some edit fixes 
* fixing edit paste
* fix power of 2 check for corner selection
* fix pasting multiple selections changed target selections
* fixing editdrag: plugging memory leak
* fixing editdrag: proper binding of keys
* fixing editdrag: allow deselecting (by selecting a second time)
* make a little more room for undos (RAM is cheap and maps are big)
* some cleanups
 2014-05-15 11:42:54 +02:00
Bukz 0a0d09e73a /paste fix, use light data from destination not the source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@6804 e016b1c5-ed68-44aa-a2f7-31cac88cffde
 2012-05-23 15:21:24 +00:00
Lee Salzman 89f42b882d make dynlight VARP 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@6660 e016b1c5-ed68-44aa-a2f7-31cac88cffde
 2011-09-30 08:11:32 +00:00
Lucas GAUTHERON 8f90268d82 multiple selections support in editmode 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@6647 e016b1c5-ed68-44aa-a2f7-31cac88cffde
 2011-09-14 14:59:40 +00:00
aerkefiende 06f73f4627 Replaced Tabs with 4 spaces in every source file 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@6561 e016b1c5-ed68-44aa-a2f7-31cac88cffde
 2011-07-31 15:44:57 +00:00
flowtron e4bc0ea4c6 informative edittoggle 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@5687 e016b1c5-ed68-44aa-a2f7-31cac88cffde
 2010-09-11 14:38:51 +00:00
Lee Salzman c2c91044a0 fix default ambient 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@4945 e016b1c5-ed68-44aa-a2f7-31cac88cffde
 2010-05-20 17:47:07 +00:00
Lee Salzman be94c703f2 setsize -> shrink 
setsizenodelete -> setsize
deletecontentsa -> deletearrays
deletecontentsp -> deletecontents
vrealloc -> growbuf



git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@4787 e016b1c5-ed68-44aa-a2f7-31cac88cffde
 2010-03-11 23:06:26 +00:00
Lee Salzman d1253d6394 added support for ambient light 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@4737 e016b1c5-ed68-44aa-a2f7-31cac88cffde
 2009-12-03 12:21:21 +00:00
Lee Salzman 54cc44c3db revising pch setup 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@4690 e016b1c5-ed68-44aa-a2f7-31cac88cffde
 2009-11-07 06:42:37 +00:00
ac_stef f1e879e7fd akimbo bug fixed; some new bugs added 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@4598 e016b1c5-ed68-44aa-a2f7-31cac88cffde
 2009-08-05 21:21:57 +00:00
Lee Salzman 4d6ffecf29 reorganized sqr storage for better cache usage 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@4113 e016b1c5-ed68-44aa-a2f7-31cac88cffde
 2009-01-04 18:42:09 +00:00
Lee Salzman 2f53b27d84 fullbright/dynlight fixes 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@3025 e016b1c5-ed68-44aa-a2f7-31cac88cffde
 2008-10-14 22:43:09 +00:00
Lee Salzman 512e8b527e newmap fullbright fix 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@3024 e016b1c5-ed68-44aa-a2f7-31cac88cffde
 2008-10-14 21:59:48 +00:00
Lee Salzman e1334495e1 properly seed the pseudo-random number generator 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@2994 e016b1c5-ed68-44aa-a2f7-31cac88cffde
 2008-10-13 06:30:18 +00:00
Lee Salzman 2675fb2aba undoing change 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@2966 e016b1c5-ed68-44aa-a2f7-31cac88cffde
 2008-10-11 21:35:12 +00:00
Lee Salzman 0b6bf147f9 use MINBORD instead of hard-coded values 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@2965 e016b1c5-ed68-44aa-a2f7-31cac88cffde
 2008-10-11 21:33:50 +00:00
Lee Salzman 704cb64130 clamp dynlight area to map 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@2964 e016b1c5-ed68-44aa-a2f7-31cac88cffde
 2008-10-11 21:31:56 +00:00
Lee Salzman 9b1004fe82 dynlight area cleanup 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@2892 e016b1c5-ed68-44aa-a2f7-31cac88cffde
 2008-10-10 22:08:15 +00:00
Lee Salzman 916c2d6154 ensure dlight area is properly updated 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@2891 e016b1c5-ed68-44aa-a2f7-31cac88cffde
 2008-10-10 22:06:53 +00:00
Lee Salzman 30bfd7b15c allow dynlight to track owner 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@2890 e016b1c5-ed68-44aa-a2f7-31cac88cffde
 2008-10-10 21:58:07 +00:00
Lee Salzman 86686dcecc added dynlight checkbox 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@2685 e016b1c5-ed68-44aa-a2f7-31cac88cffde
 2008-09-18 07:00:50 +00:00
Lee Salzman f649244a94 VC warning fix 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@2667 e016b1c5-ed68-44aa-a2f7-31cac88cffde
 2008-09-17 09:08:08 +00:00
Lee Salzman 66a83167a0 batch dynlight processing 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@2666 e016b1c5-ed68-44aa-a2f7-31cac88cffde
 2008-09-17 08:10:05 +00:00
Lee Salzman 56191aa2be fixed dynlights to actually work 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@2664 e016b1c5-ed68-44aa-a2f7-31cac88cffde
 2008-09-17 07:13:35 +00:00
Lee Salzman b76491d06e vertex lighting option for mapmodels 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@2656 e016b1c5-ed68-44aa-a2f7-31cac88cffde
 2008-09-17 03:34:58 +00:00
driAn 03f608c346 spawn ents right after adding them in editmode 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@1858 e016b1c5-ed68-44aa-a2f7-31cac88cffde
 2008-05-04 10:32:18 +00:00
driAn 9c3e74cbdf huge weapon-code cleanup (buggy!), pch, demo fix 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@1475 e016b1c5-ed68-44aa-a2f7-31cac88cffde
 2007-12-24 21:38:53 +00:00
Lee Salzman 239a570c0f *** empty log message *** 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@1006 e016b1c5-ed68-44aa-a2f7-31cac88cffde
 2007-05-18 09:03:56 +00:00
Lee Salzman fae7543e2a *** empty log message *** 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@903 e016b1c5-ed68-44aa-a2f7-31cac88cffde
 2007-04-03 18:56:40 +00:00
Lee Salzman b296653ae4 *** empty log message *** 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@869 e016b1c5-ed68-44aa-a2f7-31cac88cffde
 2007-03-31 23:44:27 +00:00
Lee Salzman de79b039a5 *** empty log message *** 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@664 e016b1c5-ed68-44aa-a2f7-31cac88cffde
 2006-11-14 15:17:43 +00:00
Lee Salzman 89a8e77a50 *** empty log message *** 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@635 e016b1c5-ed68-44aa-a2f7-31cac88cffde
 2006-11-13 03:57:53 +00:00
Lee Salzman c7469a7873 *** empty log message *** 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@548 e016b1c5-ed68-44aa-a2f7-31cac88cffde
 2006-11-09 20:09:16 +00:00
Lee Salzman fefc21a9e6 *** empty log message *** 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@483 e016b1c5-ed68-44aa-a2f7-31cac88cffde
 2006-11-06 12:44:53 +00:00
Lee Salzman 2c916e47e8 *** empty log message *** 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@482 e016b1c5-ed68-44aa-a2f7-31cac88cffde
 2006-11-06 12:40:51 +00:00
Lee Salzman 70206b3bce *** empty log message *** 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@473 e016b1c5-ed68-44aa-a2f7-31cac88cffde
 2006-11-05 18:35:19 +00:00
Lee Salzman 1802cace77 *** empty log message *** 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@472 e016b1c5-ed68-44aa-a2f7-31cac88cffde
 2006-11-05 17:41:27 +00:00
driAn 3d4ea805d3 no message 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@302 e016b1c5-ed68-44aa-a2f7-31cac88cffde
 2006-06-09 12:22:46 +00:00
driAn c6e385ea38 This commit was generated by cvs2svn to compensate for changes in r13, 
which included commits to RCS files with non-trunk default branches.


git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@14 e016b1c5-ed68-44aa-a2f7-31cac88cffde
 2005-06-23 21:57:56 +00:00