Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,674 Commits 151 Branches 18 Tags 2.1 GiB
a973155597
Commit Graph

11674 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sam
0a0fffd5ed Addressed review comments 2022-03-03 01:11:17 -05:00
Sam
5a60562eee Addressed review comments 2022-03-03 01:11:16 -05:00
Sam
ce70c512e2 Arrow trails 2022-03-03 01:11:15 -05:00
Sam
48c97cd829 Glider trails 2022-03-03 01:11:13 -05:00
Sam
eacd43be16 Moved weapon offset functions up a level. Should allow gliders and arrows to be handled better. 2022-03-03 01:11:12 -05:00
jshipsey
6ba8af5434 anim additions 2022-03-03 01:11:11 -05:00
Sam
f3c5c2b5e3 Pointy trails 2022-03-03 01:11:10 -05:00
Monty Marz
855733bdcb tiny tweak 2022-03-03 01:11:09 -05:00
Sam
b3a19ebc00 Weapon trails now works with dual wielding 2022-03-03 01:11:08 -05:00
Sam
a967daa2f5 Trails now controlled and enabled from animation files. 2022-03-03 01:11:07 -05:00
Sam
fc1a9f3c61 Trail thinning is now smooth 2022-03-03 01:11:06 -05:00
Sam
87434c472c Trails shrinks over time 2022-03-03 01:11:05 -05:00
Sam
ab4c5dac87 Reset vertices for trails in trail manager. 2022-03-03 01:11:04 -05:00
Sam
bee16001ed Don't upload weapon trails to GPUs for entities that have only zero quds. 2022-03-03 01:11:03 -05:00
Sam
cfbb3a5bca Changed to a single dynamic model 2022-03-03 01:11:02 -05:00
Sam
0542e46e7d Lighting works now hackily 2022-03-03 01:11:01 -05:00
Monty Marz
82def16969 visuals 2022-03-03 01:11:00 -05:00
Sam
c6dc96b795 Settings button to turn off weapon trails. 2022-03-03 01:10:59 -05:00
Sam
f4abe4f275 More tweaks 2022-03-03 01:10:58 -05:00
Sam
1f2ede656e Fixed tests 2022-03-03 01:10:57 -05:00
Sam
b558331b32 Finishing touches 2022-03-03 01:10:55 -05:00
Sam
d23dd6c9e9 Fixed a few errors 2022-03-03 01:10:54 -05:00
Sam
5018a9f476 Game now runs, still doesn't work 2022-03-03 01:10:53 -05:00
Sam
33419c7b4c Trails are now hackily created. 2022-03-03 01:10:51 -05:00
Sam
05f53a5316 Changed to one dynamic model per entity. 2022-03-03 01:10:50 -05:00
Sam
d9028ec978 Dynamic model now used for trail. 2022-03-03 01:10:49 -05:00
Sam
0794f980fe Mostly snaked through another rendering pipeline 2022-03-03 01:10:47 -05:00
Justin Shipsey
b8bb77a62c Merge branch 'christof/shredded_economy' into 'master' 
Diversify price calculation for items by using multiple categories per item.

See merge request veloren/veloren!3248
 2022-03-03 02:32:34 +00:00
Christof Petig
f347b9de11 Diversify price calculation for items by using multiple categories per item. 2022-03-03 02:32:34 +00:00
Joshua Barretto
dbc969251c Merge branch 'isse/rock' into 'master' 
Better rocks

See merge request veloren/veloren!3247
 2022-03-02 16:28:05 +00:00
Isidor Nielsen
bd8a7a0506 Better rocks 2022-03-02 16:28:04 +00:00
Samuel Keiffer
40d5920ca2 Merge branch 'isse/primitive-transform' into 'master' 
Primitive group transformation and RotateAround primitive

See merge request veloren/veloren!3235
 2022-03-01 23:38:05 +00:00
Isidor Nielsen
f8916f878a Primitive group transformation and RotateAround primitive 2022-03-01 23:38:05 +00:00
Dr. Dystopia
4aab1eea43 Remove redundant 'tgt_pos' variables 2022-03-01 22:54:44 +01:00
Dr. Dystopia
5aa1d3ceaf Rename 'vec3' parameter to 'pos_difference' 2022-03-01 22:47:01 +01:00
Dr. Dystopia
f99a637606 Rename 'dist_to_pos' variable to 'pos_diff' 2022-03-01 22:44:55 +01:00
Dr. Dystopia
50f877bdf6 Rename 'dist_to_pos_xy' variable to 'dist_xy' 2022-03-01 22:42:03 +01:00
Dr. Dystopia
83f46658a9 Fix pathing execution 2022-03-01 22:40:43 +01:00
Dr. Dystopia
0a3de57be6 Rename 'distance_to_target' variable to 'pos_difference' 2022-03-01 22:38:35 +01:00
Dr. Dystopia
4d24ff0027 Rename 'target_position' clojure to 'partial_path_tgt_pos' 2022-03-01 22:33:25 +01:00
Marcel
39c8834af1 Merge branch 'infrandomness/worldgen/enable_return_self_not_must_use' into 'master' 
Enable return_self_not_must_use lint

See merge request veloren/veloren!3249
 2022-03-01 10:49:17 +00:00
infrandomness
1d44247efe
Enable return_self_not_must_use lint 2022-03-01 10:53:57 +01:00
Joshua Barretto
de508c4e9d Merge branch 'ubruntu/immovable_campfires' into 'master' 
Fix waypoints being movable

Closes #1482

See merge request veloren/veloren!3246
 2022-02-28 19:20:38 +00:00
ubruntu
94a9b407c2 Fix waypoints being movable 2022-02-28 19:20:37 +00:00
Imbris
9539991e8f Merge branch 'infrandomness/server/misbehaving_clients' into 'master' 
Modify message catch-all arms

See merge request veloren/veloren!3245
 2022-02-27 23:08:48 +00:00
InfRandomness
042d258161 Modify message catch-all arms 2022-02-27 23:08:47 +00:00
Imbris
466c1c4dcb Merge branch 'ubruntu/interact-hud-fix' into 'master' 
Fix interactable HUD

Closes #1474

See merge request veloren/veloren!3240
 2022-02-27 21:50:08 +00:00
ubruntu
d18242a1df Fix interactable HUD 2022-02-27 21:50:07 +00:00
Imbris
7be5b4c051 Merge branch 'imbris/fix-possesion-comp-sync' into 'master' 
Improve possession edge cases

See merge request veloren/veloren!3233
 2022-02-27 20:10:16 +00:00
Imbris
8742a37e0f Changes based on review. Fix tests. 2022-02-27 14:43:08 -05:00