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
972 Commits 151 Branches 18 Tags 2.1 GiB
7919442d3d
Commit Graph

972 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jshipsey
46f571f99a animation minor fixes 
Former-commit-id: 4326db41103a0d3f87c7ad638fb38cd2f3eec71c
 2019-04-20 18:08:56 -04:00
Imbris
7fa37e0c2a update asset loading to not use env 
Former-commit-id: 1858f3e06a26502c8bb6a3237e216d551377f6c6
 2019-04-20 18:02:48 -04:00
jshipsey
60fa9a7e20 animattion tweaks 
Former-commit-id: 0baf418a09bfa8ffad7a0bfe4b9f5256053454fb
 2019-04-20 17:33:51 -04:00
Dominik Broński
d4002262e9 Fix fonts Issue 
Former-commit-id: ce4e6d4d0d42a48489585f208a9267b7b6aa88e6
 2019-04-20 20:48:35 +00:00
Joshua Barretto
2142cf3c02 Merge branch 'constisfuture' into 'master' 
make 11.0 a const

Closes #26

See merge request veloren/veloren!55

Former-commit-id: 29e54e5546dee739a8dfb86c9d51c18afccfd9ea
 2019-04-20 18:51:35 +00:00
Piotr
2800c9e9f5 make 11.0 a const 
Former-commit-id: 4602f3147b434e93256d48938b813325e74ad551
 2019-04-20 20:35:45 +02:00
Imbris
d6d4155fc4 rearrange hud event handling slighlty 
Former-commit-id: 8043d6c6197112123c371258407ea886a5ae3595
 2019-04-20 14:08:39 -04:00
Imbris
67584a49ce hide chat input when not typing 
Former-commit-id: a1982ef2edf991c94cea359a2892cbf13ef8e980
 2019-04-20 11:43:38 -04:00
Imbris
85dda5e505 go back to main menu when logging out 
Former-commit-id: 95956f916adb0afb47e489defa197f2b8e99b775
 2019-04-20 11:34:45 -04:00
Imbris
83ed5200b0 hide entire hud when toggling interface 
Former-commit-id: 969564ecfd85df0477db4216cd8974adf2df1921
 2019-04-20 11:34:45 -04:00
Imbris
2147774665 Stop sending empty messages 
Former-commit-id: 0f2ed6d0adbbf07566ae1cee1cb0c0498c0c15d8
 2019-04-20 11:34:45 -04:00
Dominik Broński
3cc0cf8443 Merge branch 'fix_unfix_chat_spacing' into 'master' 
Fix chat spacing

See merge request veloren/veloren!53

Former-commit-id: cc8852e87a8558b785d668786ef5d9515df0f580
 2019-04-20 14:50:01 +00:00
Imbris
eef5dd28b5 Fix chat spacing 
Former-commit-id: 2e823a1deb51e2fc77a1662b291ed1b5d01b3e70
 2019-04-20 10:46:36 -04:00
Dominik Broński
e02e2da58b Merge branch 'euc_vox' into 'master' 
Add ability to use vox files as images for ui elements

See merge request veloren/veloren!52

Former-commit-id: 2f8c48701161311365c752da9293d3cc41ef8957
 2019-04-20 13:22:34 +00:00
Imbris
0daa8ef3f3 fix scaling artifacts 
Former-commit-id: 7b90e7d033438a0c83e254ea7bcc791ad83808b3
 2019-04-20 08:59:26 -04:00
Imbris
1143c58e37 add graphic cache clearing on resize 
Former-commit-id: 49b3a52036171fd8b66d9fae73bebb15fbf83a0b
 2019-04-19 21:35:12 -04:00
jshipsey
3ff88ff478 animation adjustments 
Former-commit-id: 8720a7442a27103989eae7333b2a48265b94fd07
 2019-04-19 20:20:01 -04:00
jshipsey
4d0466a618 merge fix 
Former-commit-id: b83fed02f8a49e5914c8939bb2ec5e6f76bad2a2
 2019-04-19 19:42:12 -04:00
jshipsey
f8c9ada8a5 Merge branch 'master' of gitlab.com:jshipsey/fresh 
Former-commit-id: e2bf3a1c413883c6cd3765bdd013fe1ab6ca1e66
 2019-04-19 19:29:29 -04:00
jshipsey
86167f819e adding test assets 
Former-commit-id: 41e7862329adacfcb262d82dcee0e01c9c031d16
 2019-04-19 19:27:14 -04:00
jshipsey
b4fdc472e5 merge conflict fix 
Former-commit-id: 31fca905c387211f926031012f6c025e3d82f531
 2019-04-19 19:08:10 -04:00
jshipsey
b107a46b07 fixing conflict 
Former-commit-id: 4b0293ce11a5ae4ca0c8b265959fee2138941032
 2019-04-19 19:05:33 -04:00
Imbris
7707636c4e rearrange ui graphic code 
Former-commit-id: d0ea7feee59a1daf4ad93e9b9224750deb75ee45
 2019-04-19 15:06:58 -04:00
Imbris
0b4e268dee add blank graphic, ao for voxel graphics in the ui 
Former-commit-id: ceaba13fdd47707a8804886b5db2260a8cbba2f1
 2019-04-19 15:06:58 -04:00
Imbris
2e69526069 initial setup for .vox rendering 
Former-commit-id: bc3d2432c41d9dc3e1f57e569f3aecb9be3fe79a
 2019-04-19 15:00:13 -04:00
Marcel Märtens
48b4d3cae2 fix ci 
Former-commit-id: 75e3fa7c0811585f200262a2ae3aedc0af683e48
 2019-04-19 01:24:13 +02:00
Marcel
d072646a83 Merge branch 'ci' into 'master' 
first test of ci

See merge request veloren/veloren!50

Former-commit-id: 6d76cc9c6616330d29668c5245fa7c3d54c4daae
 2019-04-18 23:04:29 +00:00
Marcel Märtens
f494afd70f first test of ci 
Former-commit-id: 4fbb5698fc411dbf95c53da74896eb164f540fed
 2019-04-19 00:42:27 +02:00
Joshua Barretto
34f032cb06 Merge branch 'singleplayerfix' into 'master' 
Fix Singleplayer

Closes #30

See merge request veloren/veloren!48

Former-commit-id: a1806a594b373df2a1329b98fad4611a592969d1
 2019-04-18 13:59:22 +00:00
yeet
40c2625a4c Fix Singleplayer 
After a certains person's MR has been merged, for some reason all traces of working Singleplayer have disappeared

Former-commit-id: 4119e4609cd39bb1896c7f28d45f5c1a7ec9c129
 2019-04-18 15:53:03 +02:00
Joshua Barretto
913bc042be Merge branch 'master' into 'master' 
Minor fixes

See merge request veloren/veloren!47

Former-commit-id: f13bfdc22534ddd900c94ff7e59bb07cca3fbc9c
 2019-04-18 13:22:29 +00:00
Joshua Barretto
56e50f4d58 Minor fixes 
Former-commit-id: 54c2b050fd9be82916d66c872fa9ab5f5354f9dd
 2019-04-18 14:21:25 +01:00
Joshua Barretto
871d143855 Merge branch 'master' into 'master' 
Login Error Window, Alpha Version Display directly pulled from Cargo, Help Window Corrections, Small Fixes

See merge request veloren/veloren!46

Former-commit-id: 95e83944512ff30dbfbae59f247cf939d7eeb0cd
 2019-04-18 09:10:24 +00:00
Pfauenauge90
c69ba9ee56 Merge branch 'master' of https://gitlab.com/Pfauenauge/veloren 
Former-commit-id: 77298d949e6e52a4033e16558e3a84d5da0c2ef7
 2019-04-17 23:12:35 +02:00
Pfauenauge90
f7af7417ce Error Window, Alpha Version Display 
Former-commit-id: 0cdf4980eacf57db6dc275aabc26f49a0db274a6
 2019-04-17 23:12:15 +02:00
Pfauenauge90
15e498c3f5 Rebase and Login Error 
Former-commit-id: 1b7736d80dde1a10ba04936c2cfe3df4d64ec57f
 2019-04-17 23:11:29 +02:00
Pfauenauge90
1ea7b5031d Help window Closing button fixed 
Former-commit-id: 75c539985527e38b13bf7aa382d3b9491ef19fed
 2019-04-17 23:06:21 +02:00
Pfauenauge90
2e671899e0 Error Window, Alpha Version Display 
Former-commit-id: 59ee7e42ca522cdcdbec7b07dbee4d3249213aab
 2019-04-17 23:06:21 +02:00
Pfauenauge90
a23e71a258 Rebase and Login Error 
Former-commit-id: 226fca5f37aa9c94fdd3e1a030c7de4703deba4c
 2019-04-17 23:06:21 +02:00
Pfauenauge90
2c5bfaa118 Error Window 
Former-commit-id: 0f4f92c39632f8cbd1750036d19eb1cfbf39f374
 2019-04-17 23:06:21 +02:00
Pfauenauge90
cd1543d428 Merge branch 'master' of https://gitlab.com/Pfauenauge/veloren 
Former-commit-id: 8cf59c797aaaca54c6215d4074f60274727457a8
 2019-04-17 23:05:55 +02:00
Pfauenauge90
c8e60a4c75 Help window Closing button fixed 
Former-commit-id: 6b57d04e52d25b3268b45abdf6603f197d442698
 2019-04-17 22:54:34 +02:00
Pfauenauge90
3959353cc9 Error Window, Alpha Version Display 
Former-commit-id: 739fc652a7d7f0894c1ae715f83a87e56a51e947
 2019-04-17 22:54:32 +02:00
Pfauenauge90
0cfe56bc7f Rebase and Login Error 
Former-commit-id: 7383aaad0d91aa3000a38a419c317e6a52f04b27
 2019-04-17 22:54:32 +02:00
Pfauenauge90
b23ba127d7 Error Window 
Former-commit-id: a736d656b95783434e53ef27e5311ea2da553587
 2019-04-17 22:54:31 +02:00
Pfauenauge90
d7edd5ede7 Help window Closing button fixed 
Former-commit-id: 80adaac65b93562e0be6adad412db6cf413d0a64
 2019-04-17 22:46:43 +02:00
Joshua Barretto
ac71a933eb Merge branch 'master' into 'master' 
Fix animation states being sent every frame (#21)

Closes #21

See merge request veloren/veloren!45

Former-commit-id: aabce2aba011e7b02ec35714c519369bf1eea754
 2019-04-17 20:46:12 +00:00
timokoesters
86898c26a0 Rename lastAnimation to last_animation 
Former-commit-id: 7eabea72ad5ee2cfed20b3927a828eb55fae8e33
 2019-04-17 22:44:10 +02:00
Pfauenauge90
0635894557 Error Window, Alpha Version Display 
Former-commit-id: e2ad4e0974c513f806227720cdb2055c1847e9d7
 2019-04-17 22:38:52 +02:00
timokoesters
ec16153164 Rename animationHistory to animation_history 
Former-commit-id: bb2c882332fa9c3fd7f2c7fbd6143cd5f85153d8
 2019-04-17 22:32:36 +02:00