4748 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Joshua Barretto	f4040b59d7	Castle improvements	2020-08-12 21:15:52 +01:00
Joshua Barretto	73b6d6b954	Began adding castles	2020-08-12 21:15:52 +01:00
Joshua Barretto	3ab6c5ff49	Added make_block command	2020-08-12 21:15:52 +01:00
Joshua Barretto	9e5978b34b	Added forts to towns, began better economy sim	2020-08-12 21:15:52 +01:00
Joshua Barretto	ecff9d6f46	Added simple keeps	2020-08-12 21:15:52 +01:00
Songtronix	d936828c34	Merge branch 'songtronix/update-readme' into 'master' ... change: update readme See merge request veloren/veloren!1276	2020-08-12 07:11:40 +00:00
Imbris	a78629aec1	Merge branch 'songtronix/test-server' into 'master' ... change: allow `test-server` alias to run in workspace root See merge request veloren/veloren!1275	2020-08-11 07:22:20 +00:00
Songtronix	30e3ef0fa9	Merge branch 'scott-c/particles-pause-fix' into 'master' ... fix particle de-synchronisation with paused game See merge request veloren/veloren!1278	2020-08-10 12:29:16 +00:00
scott-c	4796230b3f	fix particle de-synchronisation with paused game	2020-08-10 19:04:30 +08:00
Songtronix	ba3fdaf31d	change: update readme	2020-08-10 09:05:18 +02:00
Imbris	40297d0b47	Merge branch 'ibotdeu/resolution-setting' into 'master' ... Implemented setting to change fullscreen resolution See merge request veloren/veloren!1233	2020-08-09 20:30:22 +00:00
IBotDEU	e030a2fa08	implemented ability to select bit depth and refresh rate and implemented seperate setting for fullscreen resolution	2020-08-09 20:30:22 +00:00
Imbris	87e210514f	Merge branch 'yusdacra/treeculler-update' into 'master' ... change treeculler crate from git to published version See merge request veloren/veloren!1269	2020-08-09 17:21:15 +00:00
Imbris	ee418c19f0	Merge branch 'scott-c/particles' into 'master' ... Particles See merge request veloren/veloren!1156	2020-08-09 17:09:43 +00:00
Justin Shipsey	f05b6e4e30	Merge branch 'slipped/swim' into 'master' ... swim See merge request veloren/veloren!1272	2020-08-09 16:25:11 +00:00
Justin Shipsey	88a5f2eb41	Merge branch 'master' into 'slipped/swim' ... # Conflicts: # voxygen/src/anim/src/character/swim.rs	2020-08-09 15:13:56 +00:00
Songtronix	8905769822	change: allow test-server alias to run in workspace root	2020-08-09 08:05:15 +02:00
Justin Shipsey	efe0a58b68	Merge branch 'nepo/new-bones' into 'master' ... nepo/new bones See merge request veloren/veloren!1274	2020-08-08 22:37:50 +00:00
nepo	d5e06a30b4	nepo/new bones	2020-08-08 22:37:50 +00:00
jshipsey	68b5bf1ca2	state corrections	2020-08-08 17:05:48 -04:00
jshipsey	c9138602a5	clippy, consdensed climb, corrected some swim bugs	2020-08-08 17:04:50 -04:00
jshipsey	c9f7a48cd6	swim alterations to condense the body on strong turns	2020-08-08 13:47:32 -04:00
jshipsey	72d56742c6	minor anim tweak	2020-08-08 13:47:32 -04:00
jshipsey	dc08f5655f	changelog	2020-08-08 13:47:32 -04:00
jshipsey	e4444b36e3	bandaid fix for swim wield	2020-08-08 13:47:32 -04:00
jshipsey	45c8eb98a0	readd sneak	2020-08-08 13:47:32 -04:00
jshipsey	f1426b7bac	swimming changes	2020-08-08 13:47:32 -04:00
scott-c	d3270e8274	fix rebase	2020-08-08 20:53:07 +08:00
scott-c	197285e9da	Add Copy trait to dependents	2020-08-08 19:26:52 +08:00
scott-c	51fef95cbf	update comment	2020-08-08 19:26:52 +08:00
scott-c	2bdec4d66c	Implement particle heartbeat scheduler	2020-08-08 19:26:52 +08:00
scott-c	b5982999b5	fix rebase	2020-08-08 19:26:52 +08:00
scott-c	67fa8e0b17	refactor sfx mgr outcome useage	2020-08-08 19:26:52 +08:00
scott-c	055cbad5b8	fix rebase	2020-08-08 19:26:52 +08:00
scott-c	22ee89344a	cleanup redundant function	2020-08-08 19:26:52 +08:00
scott-c	ed4cab9019	change campfire cmd to spawn object instead of npc	2020-08-08 19:26:52 +08:00
scott-c	ce49b9c599	cleanup unneeded matrix and shader code	2020-08-08 19:26:52 +08:00
scott-c	aec3bb0687	clear particle gpu instance buffer when disabled	2020-08-08 19:26:52 +08:00
Joshua Barretto	27324bc232	Explosion sound and event lights	2020-08-08 19:26:52 +08:00
Joshua Barretto	6e5b44addd	Added outcome sound effects, fixed directional sound, particle outcomes	2020-08-08 19:26:52 +08:00
Joshua Barretto	575319f3aa	Added outcome system, sound effects	2020-08-08 19:26:48 +08:00
Joshua Barretto	7725e11aee	Better hash RNG	2020-08-08 19:25:33 +08:00
scott-c	3b9ef1cba8	Add campfire command	2020-08-08 19:25:33 +08:00
scott-c	e7c1781819	Add zest's changes	2020-08-08 19:25:33 +08:00
scott-c	0f59d978d6	Update changelog	2020-08-08 19:25:29 +08:00
scott-c	b4e5dab7c5	Add toggle particles graphics setting	2020-08-08 19:25:01 +08:00
scott-c	4d1c12a503	Add particle count to debug info	2020-08-08 19:25:00 +08:00
scott-c	29a78ceaa3	Add fireball and bomb particle effects	2020-08-08 19:25:00 +08:00
scott-c	4c765eac9b	remove particle emitter component	2020-08-08 19:25:00 +08:00
scott-c	c1d1ef0549	allow for col particles	2020-08-08 19:25:00 +08:00