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
3,801 Commits 151 Branches 18 Tags 2.1 GiB
f7b497a0c2
Commit Graph

3801 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
timokoesters
61578b238e Sync animation states on initial connection 
Former-commit-id: 4ed67b6cbf56fceb03fa6a66b25b78925b91fc8a
 2019-04-17 22:30:52 +02:00
timokoesters
7e3f271838 Move code for initializing clients to new function 
Former-commit-id: 55f8a9b49599b6912489c597c47a13d7657f78f1
 2019-04-17 21:22:34 +02:00
timokoesters
5044fe8cb5 Simplify code 
Former-commit-id: c8bdf4199c913ab43ba08fdb19384bf7fcc6653d
 2019-04-17 20:06:06 +02:00
Pfauenauge90
93fedf3b86 Rebase and Login Error 
Former-commit-id: 1865dd58d43ae0a7d78b61ca3a9684ca76fce02d
 2019-04-17 19:41:22 +02:00
timokoesters
abf32d6229 Add comments 
Former-commit-id: 950c811256b8c20f58e4bb3c998acc746c4b929d
 2019-04-17 19:41:20 +02:00
timokoesters
b9607ef405 Fix #21 by checking animation history 
Former-commit-id: 5272d1d7aee73fc07edeb31d9f29238d19b7d229
 2019-04-17 19:39:12 +02:00
Pfauenauge90
69c01a92a5 Merge branch 'master' of https://gitlab.com/Pfauenauge/veloren 
Former-commit-id: 9f8264abda29d9def99b011fe9d3b2504704998c
 2019-04-17 19:38:04 +02:00
Joshua Barretto
1e4d02a5d8 Merge branch 'singleplayer' into 'master' 
Start Singleplayer server when singleplayer is selected

See merge request veloren/veloren!39

Former-commit-id: ac8c9f3f52871d89847fdecc74ac58bb593e762b
 2019-04-17 15:31:02 +00:00
Louis Pearson
a768971c6c Stop singleplayer thread whenever a session is left 
Former-commit-id: 16fcf35cbc856bebc12944781c2ac1a4daab5550
 2019-04-17 09:22:26 -06:00
Joshua Barretto
f44b05f9d3 Merge branch 'master' into 'master' 
Changed default server address to 'server.veloren.net'

See merge request veloren/veloren!43

Former-commit-id: 60cfa39be80cbe2fc4a1f6db21b19c5850aa65e6
 2019-04-17 15:08:56 +00:00
Joshua Barretto
a87cdc1993 Changed default server address to 'server.veloren.net' 
Former-commit-id: 660083d3d7ca341428b8c3cd8d54dd3ac1f453ab
 2019-04-17 16:08:25 +01:00
Joshua Barretto
cacb1855fd Merge branch 'master' into 'master' 
Change timeout to 20s

See merge request veloren/veloren!44

Former-commit-id: d2d90a870a7a429f6e0bdee86e1b0c95d362840d
 2019-04-17 15:08:00 +00:00
Louis Pearson
76adbec3bb Add method to drop singleplayer thread 
Former-commit-id: b62a90728d4e83a005687538e134cee427491052
 2019-04-17 08:57:23 -06:00
timokoesters
1ae18fecf8 Change timeout to 20s 
Former-commit-id: dca0d08a06c27259cdaaf0138024f53c6c93d94e
 2019-04-17 16:46:04 +02:00
Louis Pearson
7ec6e09332 Add basic singleplayer support 
Former-commit-id: 929b05faca5d2b95a96349dfc17a62b3165289a1
 2019-04-17 07:41:34 -06:00
Joshua Barretto
786dc16092 Merge branch 'master' into 'master' 
Added ForceUpdate component upon teleport-related commands

See merge request veloren/veloren!41

Former-commit-id: 7597499a7949620a20558a855ddb85a7ccea58d2
 2019-04-17 13:02:16 +00:00
Joshua Barretto
9286de1368 Added ForceUpdate component upon teleport-related commands 
Former-commit-id: ff10c863466e6f4f6cc931b5980917145f38b222
 2019-04-17 14:00:24 +01:00
Joshua Barretto
49a2d6be64 Merge branch 'master' into 'master' 
Fixed animation copypasta bug

See merge request veloren/veloren!38

Former-commit-id: 1ace57b79466228258c49f6943ec016a03f29231
 2019-04-17 09:08:00 +00:00
Joshua Barretto
6693d22ecd Fixed animation copypasta bug 
Former-commit-id: e4b06e4e7c50214c7d7d9cc618ea7f117dc78ccc
 2019-04-17 10:07:02 +01:00
Joshua Barretto
328a11a4af Merge branch 'master' into 'master' 
Added basic agent AI

See merge request veloren/veloren!36

Former-commit-id: 384f3be090870a308d82d543797e6c84064ccc84
 2019-04-17 09:00:30 +00:00
Joshua Barretto
8029edde0b Moved animation determination to Control ECS system 
Former-commit-id: 6650bc4d882d3f6779f99afea2e05155ad008282
 2019-04-17 09:59:38 +01:00